gentoo resync : 30.05.2020

5 files changed, 132 insertions, 0 deletions

diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index d48e56e689d4..9a0dadccea9d 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -1,3 +1,7 @@
+AUX gproftpd-8.3.2-desktop.patch 327 BLAKE2B 3c1f56cc44eb3c4f737385bce30df9071bffd489e8bff4f19a2caeb4b946559b6d316734d2dafc5408d2e9b795534d23311df313a3482d0348efd17963377073 SHA512 690f08d9ba4bdfbe1a4ba7090644e9081811a49df6c42a78a6f02900d3feef60a9b5ac73e83bc74b097f09a77e502185ac18d52017339a7fe35dc8a5b4bdbf5a
+AUX gproftpd-8.3.2-fno-common.patch 509 BLAKE2B d4dff154f0f15426e3f6c7cf610626c1850f40a55b84174e0bda30d792b38ec3e355a637c32d0975856bb5e9dc648a7f34584ab17cf3ba3e30de5ab4ad7f5af3 SHA512 24f23e7b717c58be4c5dec1595deabcff8e55a3a719d60221858b9f2ef34091c6d949349a29c3d28463359c2633737f469f322218fee6385fe851d83264bb7b1
+AUX gproftpd-8.3.2-install.patch 1791 BLAKE2B 8d2b3ef4e3f3a70a0ed887cd384e8f58a8b02886aee541f850451317fc09100c49154cb73d1b5f586d4c3d8736fccab2218b85fb8864ddf7e9e8344e93de6868 SHA512 bd19623a3ac000a9055d3d79078d3e9fe142d0da342cb30cf53cb04ff5ec849ca040787f0f3271526b7af12bf9b48466eedcdd48dee5b114c9113bf8e43ca18c
 DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
 EBUILD gproftpd-8.3.2-r1.ebuild 1464 BLAKE2B e6ac1423d2b72bcd3af9f0b34bea695d675568a313a2131e14b775f68c2ead076f4a03d4173c430f397a9f5d3ac3279c6233ebc5d5b4ce31a08c1a786ea17c69 SHA512 499040c17b64e7d89c79e681df93664dd422caa0b140b8680f7ec514b40cb1bd2448c211af1f575c120399cfac1acd87bf1d910f989aabf430fe6c6433dc1523
+EBUILD gproftpd-8.3.2-r2.ebuild 1071 BLAKE2B 422554bf06d88404762858e3b17eebc6e9ce4b55835472a7a5fcad3ae433b8d53ccc29ee1b7959e71fd8593917220c69e9207c339997e5a890127abcaf359232 SHA512 2d5c8e9eba3e71ba0e2ec4ac05c10c68c6fbdb90acb363774f580155b5b0239072ddbe18e041be0a07ffce6a85052954cbcdf3d41d34d924027c5d0859b6b5f1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch
new file mode 100644
index 000000000000..a7ac93e0c4af
--- /dev/null
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch
@@ -0,0 +1,12 @@
+--- a/desktop/net-gproftpd.desktop
++++ b/desktop/net-gproftpd.desktop
+@@ -16,7 +16,7 @@
+ GenericName=GPROFTPD
+ Comment=Proftpd FTP server administration
+ Exec=gproftpd
+-Icon=gproftpd.png
++Icon=gproftpd
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base;
++Categories=Network
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
new file mode 100644
index 000000000000..af3b579d77f7
--- /dev/null
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch
@@ -0,0 +1,25 @@
+--- a/src/apply_user.c
++++ b/src/apply_user.c
+@@ -52,11 +52,6 @@
+ //gchar *dir; // ???
+ extern gchar *homedir;
+ 
+-/* The 18 checkbox values */
+-gchar *dir_val[19]; // ???
+-
+-char *user_profile; // ???
+-
+ extern long num_rows;
+ extern int row_pos;
+ 
+--- a/src/dir_treeview_funcs.h
++++ b/src/dir_treeview_funcs.h
+@@ -18,6 +18,8 @@
+  *
+  */
+ 
++extern gchar *dir_val[19];
++extern char *user_profile;
+ 
+ gboolean dirs_foreach(GtkTreeModel *model, GtkTreePath *path,
+ 		      GtkTreeIter *iter, struct w *widgets);
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch
new file mode 100644
index 000000000000..3db967d01a1d
--- /dev/null
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,26 +19,28 @@
+ 	     fi \
+ 	   done \
+ 	fi;
+-	if test -d $(DESTDIR)$(datadir)/pixmaps; then \
++	if test -d $(datadir)/pixmaps; then \
+ 	   cp pixmaps/gproftpd.png $(DESTDIR)$(datadir)/pixmaps/; \
+ 	fi;
+-	if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \
++	if test -f $(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \
+ 	   ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gproftpd; \
+ 	fi;
+ 	@echo "Failsafe for a mixed environment"
+ 	if test -f $(DESTDIR)/usr/local/bin/consolehelper && test ! -f $(DESTDIR)/usr/local/bin/gproftpd; then \
+ 	   ln -s $(DESTDIR)/usr/local/bin/consolehelper $(DESTDIR)/usr/local/bin/gproftpd; \
+ 	fi;
+-	if test -d $(DESTDIR)$(sysconfdir)/pam.d; then \
++	if test -d $(sysconfdir)/pam.d; then \
++	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d; \
+ 	   cp etc/pam.d/gproftpd $(DESTDIR)$(sysconfdir)/pam.d/; \
+ 	fi;
+-	if test -d $(DESTDIR)$(sysconfdir)/security/console.apps; then \
++	if test -d $(sysconfdir)/security/console.apps; then \
+ 	   cp etc/security/console.apps/gproftpd $(DESTDIR)$(sysconfdir)/security/console.apps/; \
+-	fi;   
+-	if test -d $(DESTDIR)$(datadir)/applications; then \
+-	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/; \
+ 	fi;
+-	if test -d $(DESTDIR)$(datadir)/gnome/apps/Internet; then \
++	if test -d $(datadir)/applications; then \
++	   $(mkinstalldirs) $(DESTDIR)$(datadir)/applications/; \
++	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/gproftpd.desktop; \
++	fi;
++	if test -d $(datadir)/gnome/apps/Internet; then \
+ 	   cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/gnome/apps/Internet/; \
+ 	fi;
+ 	if test ! -d $(DESTDIR)$(datadir)/doc/gproftpd; then \
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
new file mode 100644
index 000000000000..c801cf286c72
--- /dev/null
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="GTK frontend to proftpd"
+HOMEPAGE="https://mange.dynalias.org/linux/gproftpd"
+SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-libs/atk-1.0
+	>=media-libs/freetype-2.0
+	>=x11-libs/pango-1.0
+	dev-libs/glib:2
+	virtual/libiconv
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-install.patch
+)
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	rm -r "${D}/usr/share/doc/gproftpd" || die
+}
+
+pkg_postinst() {
+	elog "gproftpd looks for your proftpd.conf file in /etc/proftpd"
+	elog "run gproftpd with the option -c to specify an alternate location"
+	elog "ex: gproftpd -c /etc/proftpd.conf"
+	elog "Do NOT edit /etc/conf.d/proftpd with this program"
+}