gentoo resync : 24.12.2018

5 files changed, 3 insertions, 157 deletions

diff --git a/x11-plugins/wmfrog/Manifest b/x11-plugins/wmfrog/Manifest
index 98339250624f..52d598fa01a6 100644
--- a/x11-plugins/wmfrog/Manifest
+++ b/x11-plugins/wmfrog/Manifest
@@ -1,7 +1,3 @@
-AUX 01-fix-segfault-0.2.0.patch 1350 BLAKE2B 6847a3689fa1de257c59220b98a66101133d5b833c6c9aac2f345cea83cd69691da372a2332fab619b8a676a2945585cd3d60b4002236af1958a2b3620b9ed15 SHA512 c01b3c78c12e58c30a5e634946ac7ec9ad285824010ba460781efca444a54caa5bf4426640b7245fd48d5ab8fd1ec519cd01ced96c2510e0f842f6f5125a2f27
-AUX 02-buffer-overflow-0.2.0.patch 1794 BLAKE2B 03e9cb505b4cedb3d094d997f4754ab9f55101ba0df02808563eb88343499d58bd72f55e4883a52deffa41ddb1c601f7017b7600e7dbd3e08ea3202fb2830ca8 SHA512 62a2b38bba61426810c3833a22733b3d4a7541f31b0153e3881e08b495150a819764769b55fa3f878ac6e62f603a52f0e5c074df364522347af670d979e61f26
-DIST wmfrog-0.2.0.tgz 59113 BLAKE2B 39241240ee0477e8d587e634be74184c50b34078be329bab1786a0223395e76e6284693096fc0050ee6a32308dbe0b1f8540ead21c1c2509d158a1ff4b94b0c4 SHA512 e704600d2a3ce4ff64e4c5393ec4b977356ed18545b937102c2a120f6407f1b879f050a1a7f324c8ea40e2360dfb8147bf24e9910483aebb24a3f8e2692537f4
 DIST wmfrog-0.3.1.tgz 128499 BLAKE2B 5bde4ccf41fda8e1a7e4fe9d40727e0d86d65830cc749955f5b1c97949c543f8f7253ddc6fffa48fc606e23c2ff6b4c66e07c66807a43e02f68961dfbb20d683 SHA512 35cd7da8ec0173f4799119191cd28befaed0fd5ea09c0dd2e9789ce37e9a1a4a83a9fb4562051a8da9c1449eafc8299c86914cb6f0e5bc35bd051560442af7ee
-EBUILD wmfrog-0.2.0-r1.ebuild 796 BLAKE2B 1027094fc338b7f24d3473547aff2a37f20ed20428d81633d709c5ef75972f55c18fa3a861b10ffd00ce2523ceff0f335cff999d7dcda1ee9361203ac2357b6b SHA512 487f0052e17ada996a75915ddd09f80b67c499c768f876d182a6a3c16c05c3a452158da77d9447f43f643c38189620f3c63ad2247da362a429362447b7fef625
-EBUILD wmfrog-0.3.1-r1.ebuild 672 BLAKE2B 651f38e92292e180e448a2e7ef63749a610f9d3584a88bdaab0a649311036ac52b5b086229199e78a36708aa15022519497fa61cbcf5ddde937dbfcaab81280e SHA512 6df5409bf45fcb890155e874d9f04816b4e6f6211b9930d0a5a06b7fac4330a30a06589d090464c54745d24342d6e5e85392bd597d994f5335c48be3fdbb5787
+EBUILD wmfrog-0.3.1-r1.ebuild 667 BLAKE2B a8681e90de83acdf40bbe8297aed249ad0c19c6a352bcd68c496a651c09ee399ed872bd2704486ca995cfc3c80efe12e4962e7eb6ce3bd0ca2db60d49299c3ca SHA512 ba65b0d12577829123c55f97830d9ab554e097f305b5b38ba5526b1c06b786eb517ded7be86decb908877172b8269a5458d68d6320bff49f215929c99646884f
 MISC metadata.xml 328 BLAKE2B 4d9379b73162de003a92fc6b9aa8bdce8969c815e2181b62a1be2331e422deb78ae7283a29f28a85a20ff7664378ee88e41f3db4cc302a2351f08e8a349e0fab SHA512 279b5bfe4731afe774f94c0588cb4939e33a8680d07fd1c0504f18f23e47dd4b11bea2237c5422896a5b204926dd6fc39237a62dc70d751891f2cd1bacfa48e7
diff --git a/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch b/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch
deleted file mode 100644
index 7e88f49058ff..000000000000
--- a/x11-plugins/wmfrog/files/01-fix-segfault-0.2.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7b9ead8d480eb2be07db646e9c6383f3397beaea Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <lack@gentoo.org>
-Date: Thu, 6 Aug 2009 12:22:26 -0400
-Subject: [PATCH] Fixed segfault if Weather or Clouds not present
-
-Though the variables 'weatherFound' and 'cloudsFound' were being set properly by
-fscanf, their values were never actually checked.
-
-Furthermore, the strings (Weather, Clouds, tmp1 and tmp2) were not being
-initialized to NULL as the code seems to have been expecting.
----
- Src/wmFrog.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Src/wmFrog.c b/Src/wmFrog.c
-index e2d82af..af4101a 100644
---- a/Src/wmFrog.c
-+++ b/Src/wmFrog.c
-@@ -68,10 +68,10 @@ int		n, s, m, i, dt1, dt2, dt3    ;
- XEvent		event;
- char		command[1024], Line[512], FileName[10];
- FILE		*fp;
-- char*          Weather;
-- char*          Clouds;
-- char* tmp1;
-- char* tmp2;
-+ char*          Weather = NULL;
-+ char*          Clouds = NULL;
-+ char* tmp1 = NULL;
-+ char* tmp2 = NULL;
-  int intensity=0;
-  char* precip;
-  char* desc;
-@@ -238,7 +238,7 @@ FILE		*fp;
- 	      keepgoing=1;
- 		    {
- 
--		do{
-+		if (weatherFound) do{
- 
- 		    
- 		    tmp1=mystrsep(&Weather,";");
-@@ -289,7 +289,7 @@ FILE		*fp;
- 		while(keepgoing);
- 		    }
- 
--		do{
-+		if (cloudsFound) do{
- 		    tmp1=mystrsep(&Clouds,";");
- 		    if(tmp1)
- 		      {
--- 
-1.6.3.3
-
diff --git a/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch b/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch
deleted file mode 100644
index c4267585836c..000000000000
--- a/x11-plugins/wmfrog/files/02-buffer-overflow-0.2.0.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5cc2198aebf090b399bd8aaea0e1c8b054bbda58 Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <i.am@jimramsay.com>
-Date: Thu, 6 Aug 2009 12:51:56 -0400
-Subject: [PATCH] Remove buffer overflows
-
-Replaced all 'sprintf' calls with 'snprintf' and fixed all buffers to reasonable
-sizes.
----
- Src/wmFrog.c |   11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/Src/wmFrog.c b/Src/wmFrog.c
-index af4101a..74e8b56 100644
---- a/Src/wmFrog.c
-+++ b/Src/wmFrog.c
-@@ -66,7 +66,7 @@ char* folder;
- int main(int argc, char *argv[]) {
- int		n, s, m, i, dt1, dt2, dt3    ;
- XEvent		event;
--char		command[1024], Line[512], FileName[10];
-+char		command[1024], Line[512], FileName[128];
- FILE		*fp;
-  char*          Weather = NULL;
-  char*          Clouds = NULL;
-@@ -213,7 +213,7 @@ FILE		*fp;
- 	    
- 	    dt2 = 0;
- 
--	    sprintf(FileName, "%s/%s", folder, StationID);
-+	    snprintf(FileName, 128, "%s/%s", folder, StationID);
- 		fprintf(stderr,"%s\n\n",FileName);
-     	    if ((fp = fopen(FileName, "r")) != NULL){
- 	      fscanf(fp, "Hour:%d", &hour);
-@@ -571,7 +571,7 @@ UpToDate = 0;
- 	    /*
- 	     *  Execute Perl script to grab the Latest METAR Report
- 	     */
--	    sprintf(command, "/usr/lib/wmfrog/weather.pl %s %s &", StationID, folder);
-+	    snprintf(command, 1024, "/usr/lib/wmfrog/weather.pl %s %s &", StationID, folder);
- 	    //printf("Retrieveing data\n");
- 	    system(command);
- 	    ForceDownload = 0;
-@@ -844,12 +844,11 @@ char *GetTempDir(char *suffix)
- {
- 	uid_t id;
- 	struct passwd *userEntry;
--	char * userHome;
-+	static char userHome[128];
- 	
- 	id=getuid();
- 	userEntry=getpwuid(id);
--	userHome=userEntry->pw_dir;
--	sprintf(userHome,"%s/%s",userHome,suffix);
-+	snprintf(userHome, 128, "%s/%s", userEntry->pw_dir, suffix);
- 	return userHome;
- }
- 
--- 
-1.6.3.3
-
diff --git a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
deleted file mode 100644
index ec123100e9b1..000000000000
--- a/x11-plugins/wmfrog/wmfrog-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a weather application, it shows the weather in a graphical way"
-HOMEPAGE="http://wiki.colar.net/wmfrog_dockapp"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/Src
-
-src_prepare() {
-	epatch "${FILESDIR}"/*-${PV}.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" INCDIR="" \
-		LIBDIR="" SYSTEM="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ../{CHANGES,HINTS}
-}
diff --git a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
index 2951a537833d..b3b8ab1a8a4d 100644
--- a/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
+++ b/x11-plugins/wmfrog/wmfrog-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libXpm