[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/, net-ftp/gproftpd/files/, profiles/
commit: e127c6f10d177b16ef4a005e5d0fa4d61883de5d Author: Jakov Smolić gentoo org> AuthorDate: Tue Dec 20 16:20:01 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Dec 20 16:30:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e127c6f1 net-ftp/gproftpd: treeclean Closes: https://bugs.gentoo.org/796647 Closes: https://bugs.gentoo.org/550524 Signed-off-by: Jakov Smolić gentoo.org> net-ftp/gproftpd/Manifest | 1 - .../gproftpd/files/gproftpd-8.3.2-desktop.patch| 12 - .../gproftpd/files/gproftpd-8.3.2-fno-common.patch | 25 -- .../gproftpd/files/gproftpd-8.3.2-install.patch| 39 --- net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild | 56 -- net-ftp/gproftpd/metadata.xml | 5 -- profiles/package.mask | 1 - 7 files changed, 139 deletions(-) diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest deleted file mode 100644 index 2248ebd2a707.. --- a/net-ftp/gproftpd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59 diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch deleted file mode 100644 index a7ac93e0c4af.. --- a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ 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 deleted file mode 100644 index af3b579d77f7.. --- a/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch +++ /dev/null @@ -1,25 +0,0 @@ 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 deleted file mode 100644 index 3db967d01a1d.. --- a/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch +++ /dev/null @@ -1,39 +0,0 @@ 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 \ - c
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: 308e1cb632dd28cf7f5afbe63276b4da71a85c7b Author: Sam James gentoo org> AuthorDate: Thu Jul 1 06:43:47 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jul 1 06:45:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308e1cb6 net-ftp/gproftpd: drop configure mv Closes: https://bugs.gentoo.org/799446 Signed-off-by: Sam James gentoo.org> net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild index 5c4a7511682..155984d3f6f 100644 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild +++ b/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild @@ -39,8 +39,6 @@ DOCS="AUTHORS ChangeLog README" src_prepare() { default - mv configure.{in,ac} || die - eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: e889ba852241d0e05e677a3ec69228c84abc1e92 Author: Sam James gentoo org> AuthorDate: Wed Jun 30 18:39:47 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 30 18:39:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e889ba85 net-ftp/gproftpd: add missing libcrypt dependency Signed-off-by: Sam James gentoo.org> .../{gproftpd-8.3.2-r2.ebuild => gproftpd-8.3.2-r3.ebuild} | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild similarity index 91% rename from net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild rename to net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild index ad2fc0d7dc3..5c4a7511682 100644 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild +++ b/net-ftp/gproftpd/gproftpd-8.3.2-r3.ebuild @@ -1,21 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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" +KEYWORDS="amd64 ~ppc sparc x86" RDEPEND=" >=dev-libs/atk-1.0 >=media-libs/freetype-2.0 >=x11-libs/pango-1.0 dev-libs/glib:2 + virtual/libcrypt:= virtual/libiconv x11-libs/gtk+:2 " @@ -35,6 +38,9 @@ DOCS="AUTHORS ChangeLog README" src_prepare() { default + + mv configure.{in,ac} || die + eautoreconf }
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: e923b7647aba26628d41c30818b037b7f4e23af8 Author: David Seifert gentoo org> AuthorDate: Sun Nov 29 09:55:42 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 29 09:55:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e923b764 net-ftp/gproftpd: Remove old Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild | 63 --- 1 file changed, 63 deletions(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild deleted file mode 100644 index a67b5076d1b..000 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="GTK frontend to proftpd" -HOMEPAGE="http://mange.dynup.net/linux.html"; -SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"; -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc sparc x86" -SLOT="0" - -IUSE="gnome ssl" - -# Requiring ProFTPD 1.2.9 due to security fixes -RDEPEND="x11-libs/gtk+:2 - dev-libs/glib:2 - >=x11-libs/pango-1.0 - >=dev-libs/atk-1.0 - >=media-libs/freetype-2.0 - ssl? ( >=dev-libs/openssl-0.9.6f ) - >=net-ftp/proftpd-1.2.9" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - local modules includes myconf - - #location of proftpd.conf - myconf="/etc/proftpd" - - if use ssl; then - # enable mod_tls - modules="${modules}:mod_tls" - includes="${include}:/usr/kerberos/include" - fi - - econf --sysconfdir=${myconf} \ - --localstatedir=/var \ - --with-modules=${modules} \ - --with-includes=${includes} -} - -src_install() { - emake DESTDIR="${D}" install - -# Add the Gnome menu entry - if use gnome; then - insinto /usr/share/gnome/apps/Internet/ - doins "${S}"/desktop/net-gproftpd.desktop - fi - - dodoc AUTHORS ChangeLog README - - 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" -}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: b1b30c87ee979c40e93a8adc39d495022c952ed0 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Nov 29 08:12:47 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Nov 29 08:12:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b30c87 net-ftp/gproftpd: amd64 stable wrt bug #757174 Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild index d3f36f9a9aa..ad2fc0d7dc3 100644 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild +++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild @@ -8,7 +8,7 @@ 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" +KEYWORDS="amd64 ~ppc sparc x86" SLOT="0" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: 7d7006e325f99c0fce571d49d8aa57b6dab009fd Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Nov 28 23:33:59 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 29 00:13:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7006e3 net-ftp/gproftpd: stable 8.3.2-r2 for sparc, bug #757174 Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild index 9f6648c9fb7..d3f36f9a9aa 100644 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild +++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild @@ -8,7 +8,7 @@ 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" +KEYWORDS="~amd64 ~ppc sparc x86" SLOT="0" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: ed0ca429fa3303bc4e872aadb5355e8ab11c8a16 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 27 16:44:19 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 27 16:44:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0ca429 net-ftp/gproftpd: x86 stable (bug #757174) Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild index c801cf286c7..9f6648c9fb7 100644 --- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild +++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild @@ -8,7 +8,7 @@ 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" +KEYWORDS="~amd64 ~ppc ~sparc x86" SLOT="0" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/files/, net-ftp/gproftpd/
commit: fd79bfc0c19fd6985c6b4dcd4782006eb2123a66 Author: Jeroen Roovers gentoo org> AuthorDate: Thu May 28 10:03:52 2020 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu May 28 10:13:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd79bfc0 net-ftp/gproftpd: Fix building with CFLAGS=-fno-common Also: - EAPI=7 - Use HTTPS (except for SRC_URI which was already failing) - Drop pointless USE flags (see below) - Fix dependencies: openssl is not used (drop USE=ssl), proftpd should not be a dependency at all as gproftpd merely edits its run-time configuration files, add gettext/libiconv - Fix .desktop file and install it at the correct location (drop USE=gnome) - Drop configuration flags that very obviously belong to proftpd and not gproftpd Package-Manager: Portage-2.3.100, Repoman-2.3.22 Closes: https://bugs.gentoo.org/710878 Signed-off-by: Jeroen Roovers gentoo.org> .../gproftpd/files/gproftpd-8.3.2-desktop.patch| 12 + .../gproftpd/files/gproftpd-8.3.2-fno-common.patch | 25 +++ .../gproftpd/files/gproftpd-8.3.2-install.patch| 39 net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 52 ++ 4 files changed, 128 insertions(+) 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 000..a7ac93e0c4a --- /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 000..af3b579d77f --- /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 000..3db967d01a1 --- /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/gproft