gentoo resync : 22.01.2021

4 files changed, 108 insertions, 9 deletions

diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 6f3c5d388d70..ef8692e86b58 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,5 +1,7 @@
 AUX pureadmin-0.4-QA-desktop-file.patch 186 BLAKE2B 964d5fa4353b6514dd70f997f251418f9ed4de7dd865693b3603e1f49dbef368ff2b298bab542a590ab417fefee8be1a0165e039d6b9f5189c9dbcdc19962ea6 SHA512 98e00f785a3fd5dca53321f0f6faa7f3ceaf5d8217e28492b4bcbb21eb59b3d0b894485850fb09f5e307bca3a6f03b2e442f8e863b655de1248beefa1e023134
-AUX pureadmin-0.4-gold.patch 842 BLAKE2B 43a20608f3d86ae4fa0ad3b9bb21f17e0643521a15e727ff206dcada573aad24ad525c36bdb4dde4910d5e591f145dfe651d42a46f0ea2ac5b7da58724086f1a SHA512 1c6848987cf21c023cabecd8107d9f4292e704164c4330bd8c43217b7ebd1a6d74a5476c8ab1586e2a1f683f7e35926dfe8c3cbae91b01617e6689dc966e8851
+AUX pureadmin-0.4-fno-common.patch 1071 BLAKE2B 4c1b6be9a4f87a35f5359dd3e5f47ed1eebfb08096d02fef96d5a3cc0b54788ab5d399701be66d38a56c3f6baf28fcbf43a074870d866079cd20b073a6ba1dc0 SHA512 ac93ec4c8ec7deae4f2a2a4fc48c8448e15c108d74ba4d732bb523a07173f762ad2bac812d4d07bf0dfc260760e7898678305525f90ce7920d9236c1613094a0
+AUX pureadmin-0.4-gold.patch 583 BLAKE2B 8567eaf1f18d2751aed81e71a1fe947b3cb735421885e7010488204029a13e096c7d02cb7a425986d6c3ffafb2090105ae7f6901c1c1e452c8a557095375953d SHA512 71bf32b5a0bcb718ab41d1d8bd13d443a486ae553be8ee27142dd5a8a56e089700275e74d31aa1179cfb1a6ec8e8cfab3b8e5d01f909c01ca46d75685556f13c
 DIST pureadmin-0.4.tar.gz 386739 BLAKE2B e0699210d6f22f4043bd667e82993b019e8a58b16d42157be42f4497ee383e1da7935beca77491e105a1b3537ef1920cbe57b0cc8ce1e48fb30c01c491f9605e SHA512 46fd4caff0d6c123412478690411409038d5590cc7388993eed35fc33a34302b8310ae1ede971ed31cbf29ba4ef3b4c21ce5b8c9b225659b3110c6abcd1e78c6
 EBUILD pureadmin-0.4-r1.ebuild 1293 BLAKE2B d29a24337ed7162606ecdff73eca78c63695d7bbacbfa2628ad124c4aa43b12d03a6c028d5d439cd85cee0e9533a326bb4ee60b7f1f47892e945761852ae0128 SHA512 fb1889e5bb130b02c6d67471b4e125a1830389d88b00dfe293358e59876a9ca8cc8d4903d6735d57de0f1038dcfdf010ae85d4b476f2c73dc3bce5733fea1284
+EBUILD pureadmin-0.4-r2.ebuild 1392 BLAKE2B 17b6dfd5bc708a66f80d7167f5bf9b4992170a28b164b954d68487556c786fd81c83590bad2d11a1208e18659971989f21a9b3aba9728128177d9a136692cc3f SHA512 782991cfea38dd0a5408e19b6de0fd4c82960b4d6ec854b61c4a35d3011ea60f9f0a646ba429009d17d663bf2a6b7d522726dd164c2ab356f31c7f7f009e8137
 MISC metadata.xml 243 BLAKE2B 92e4be4dc62f417ee02761d2b2c43ab9b95775a33959160c8ca1af42923063413b128c2169b5d10dfa5b9a14753686f2df8ce32648935924e2e985800b2d6914 SHA512 b51712ea8ad59d4f1138caaa9889a7f35c9b3dea5ba47ee1e93b44d66f4d4d1faee4f52ff95c9c09041593086cf8cb3ba5eeca655a58a754df5e9f956b6867f2
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch
new file mode 100644
index 000000000000..829867e8c0db
--- /dev/null
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-fno-common.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/707206
+--- a/src/globals.h
++++ b/src/globals.h
+@@ -90,7 +90,7 @@ typedef enum {
+ 	RUNMODE_INETD    /* Running through inetd or similar */
+ } ftp_runmode_t;
+ 
+-ftp_runmode_t ftp_runmode;
++extern ftp_runmode_t ftp_runmode;
+ 
+ void exit_program (void);
+ 
+--- a/src/gui_helper.c
++++ b/src/gui_helper.c
+@@ -39,6 +39,7 @@
+ #include "binreloc.h"
+ #include "system_accounts.h"
+ 
++extern ftp_runmode_t ftp_runmode;
+ EggStatusIcon *status_icon = NULL;
+ 
+ static gchar *sec_to_time (gulong sec)
+--- a/src/main.c
++++ b/src/main.c
+@@ -53,6 +53,7 @@
+ gboolean timeout_update_activity (gpointer data);
+ gboolean timeout_check_for_availability (gpointer data);
+ 
++ftp_runmode_t ftp_runmode;
+ static ftp_runmode_t get_ftp_runmode (void);
+ static void activity_show_error_message (const gchar *errmsg);
+ static void activity_show_welcome_message (void);
+--- a/src/mainwin_cb.c
++++ b/src/mainwin_cb.c
+@@ -46,6 +46,7 @@
+ 
+ popup_src_t popup_source;
+ 
++extern ftp_runmode_t ftp_runmode;
+ gboolean usermanager_initialized = FALSE;
+ 
+ static void update_adv_info (void)
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
index 7b19565ac10a..c410da51f507 100644
--- a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
@@ -1,9 +1,3 @@
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 94f61e0..0ebb561 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -38,5 +38,5 @@ pureadmin_CFLAGS = -std=gnu99 -Wall
@@ -13,8 +7,6 @@ index 94f61e0..0ebb561 100644
 -pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@
 +pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ -lm -lX11
  
-diff --git a/src/Makefile.in b/src/Makefile.in
-index b2ade45..dd9401c 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -249,7 +249,7 @@ pureadmin_SOURCES = \
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
new file mode 100644
index 000000000000..9932e66fe383
--- /dev/null
+++ b/net-ftp/pureadmin/pureadmin-0.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="GUI tool used to make the management of Pure-FTPd a little easier"
+HOMEPAGE="http://purify.sourceforge.net/"
+SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="
+	gnome-base/libglade:2.0
+	sys-libs/zlib
+	virtual/fam
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-QA-desktop-file.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+
+	# prevent "make check" from complaining
+	cat >> po/POTFILES.skip <<- EOF || die
+		src/eggstatusicon.c
+		src/eggtrayicon.c
+		src/prereq_usrmanager.c
+	EOF
+}
+
+src_install() {
+	default
+
+	# Move the docs to the correct location, if we want the docs
+	use doc &&
+		dodoc -r "${ED}"/usr/share/pureadmin/docs/.
+	rm -Rv "${ED}"/usr/share/pureadmin/docs || die
+
+	make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
+}
+
+pkg_postinst() {
+	ewarn "PureAdmin is at a beta-stage right now and it may break your"
+	ewarn "configuration. DO NOT use it for safety critical system"
+	ewarn "or production use!"
+
+	elog
+	elog "You need root-privileges to be able to use PureAdmin."
+	elog "This will probably change in the future."
+	elog
+}