gentoo resync : 30.05.2020

3 files changed, 76 insertions, 0 deletions

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 \