gentoo auto-resync : 28:04:2024 - 23:59:44

5 files changed, 132 insertions, 0 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 22acb18ab1b0..7c7f5a3e1948 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmcalendar/Manifest b/x11-plugins/wmcalendar/Manifest
index ea50dee3e125..e188ebeeaa65 100644
--- a/x11-plugins/wmcalendar/Manifest
+++ b/x11-plugins/wmcalendar/Manifest
@@ -1,7 +1,10 @@
+AUX 0001-fix-obvious-typo-causing-out-of-bounds-memory-access.patch 866 BLAKE2B dcd5564234567d8fc923cca3037b75697031f3b120cbe7e2000d7cfc2480ec5d20e6454e4dad1485594991ccb65affbe33657d3d368daf6588a3b0ef2405dc09 SHA512 bce367b28ad31cac879f7b36f8b5d0634d47fbe9532f86bb2d5ac0a529a6dae269ba81951811e477c245d12ac929786253ccc94d30b6f99c76b712d3150aa3df
 AUX wmcalendar-0.5.2-exit-sin-and-cos.patch 1835 BLAKE2B e85a288b71599ade23e00292c09eaa840eb271f1f96ca3e845462defbc3319912e33e7251b5d08b685a6fc81fab452fe12adff9b575f1ae13f3ed3224cacabc8 SHA512 dba719a3e12fca09f57e412a42e60b32e7d57590a76f606e4646e44bd783784b900e8323122191483f206c6b87e508801ad5c15810b4d98ce0624556b5ba92de
 AUX wmcalendar-0.5.2-fno-common.patch 3113 BLAKE2B 565792a4eb558e553a8c42affb630720b6275d98903094b1b9228b566cdae6bc50a7f91ee24cc1fe21ff514446912e56f47c31963860d116d5e1e1a58e452fac SHA512 8bd1a12b00005c0c9fe2402702034cc3cfef2b2cb76252c16e8315a8180d8f161ffb8c1dcad00a8a488061e0a25fd596bf78ac873131fe76257026890383f698
 AUX wmcalendar-0.5.2-ical.patch 387 BLAKE2B a9e8f848f29a2c83aae4e7f0efaec3efdcad6e56488ce8856a3ff19883b3a2c2ddf948148a8d7c45a3ba358f16274881a3ac8c93a081f4dac48e1ddc93ed334d SHA512 e7460227db5ca45ba3f909eba1ea95244d6464f496cbcbdb96e7879a728dbdcf64e8c25625ef05fb8f19713e400fc4b5c8f879526f734dd3e637d179e7186917
 AUX wmcalendar-0.5.2-rename_kill_func.patch 638 BLAKE2B b29503b9a3c6cfcac5cc970a6185c7a5f536a59baa9c2aae25b0f60507e20e6115889894dc82c336392d02c08d8cab4870352f32f94c5cf8656f470789ee12f6 SHA512 f81f3cdf3ea085dbd43e7b81d80c3d44c17945116996171a90f5823d711675851877e5474acdbd0f73989eb071d11826914e83420c596d1484fb4410a489e857
+AUX wmcalendar-c99.patch 1675 BLAKE2B 02e0e0996edcaa78e4d28b722329f78accb02b10b59834f541ebd341c1fcb539fc255c83fc0c9b073c5b25fbcc4c5a9e0b5771dec1f7f84ecaea38ec0875c3bc SHA512 70cd19845af4beabbeb87367106d7ff64433448d99e731c1c22c34409149ea22d8da39e782dc0a290a7e3ee7288c61b0bc01165519b6872e5fa6093c99b7539b
 DIST wmcalendar-0.5.2.tar.gz 42720 BLAKE2B b2de08905b368322013c3fd6fb4d87b5f7a986bee7b7de24fe2ce3be0003acc5e888dd01d9dedba85fa60ad211be23fb8623b432e5687e4ff2592b514dc549f0 SHA512 8d60a46f26657bf4876057ed092440018055e5a1ab6e2811a9c27f351533bfe6c941dbec10880daafe0858766cb890863cb66bfb70412e025a8d59ab96c663d7
 EBUILD wmcalendar-0.5.2-r2.ebuild 759 BLAKE2B 6939386f8830f541a76f7ad372006a5e4c54947c39b6aae760d38c2fdcf4f1d93404905c8d485abfb62b46157917738ad537649822715c0813815982d2a24688 SHA512 7d760d2eaab282b6431de5ac58c7b88587d077cbb39143d67e6120799694559b790b2dcfc29ce1829c70641e5dc06630ea8d5e2f17d7dc61cb2551fce2dd15ab
+EBUILD wmcalendar-0.5.2-r3.ebuild 876 BLAKE2B eaa66d9f649bcac4b5effc9f9fffcd28c0aca407b78e2a0573ac7a95f23e11d91ef92d14a752ed25b463c375a93e9e72d612a0c03cc1f4ca0ee57db2c13ad236 SHA512 61b8c98874ec816e2b6df383aa8a561263bfb9aee9984429c0c0e4a4fc1128672669d8ccfbaa319a05596e4a9fe9255c79efdd8c702dd0c6c1d0c7c8495315b1
 MISC metadata.xml 333 BLAKE2B ea485907bcdf69da77b0d4bd7e6e7090125bb625e7a7465e7bacbc6988667a72492fe83c5da4f6e37b4b88ccf5283f6995690cd47f5b5b596a081cdd9d33b453 SHA512 582863d15d742bc1546739e526a62b93e31c3f7e3fd2f80e88b8feef212d43a48cdb5bf6990e1cbf36ad74124c2fd1a5479e6917dfd285fd09888d9b50b86d18
diff --git a/x11-plugins/wmcalendar/files/0001-fix-obvious-typo-causing-out-of-bounds-memory-access.patch b/x11-plugins/wmcalendar/files/0001-fix-obvious-typo-causing-out-of-bounds-memory-access.patch
new file mode 100644
index 000000000000..8565fe879b29
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/0001-fix-obvious-typo-causing-out-of-bounds-memory-access.patch
@@ -0,0 +1,27 @@
+From ce49fa7696aadb61bb770bc42181d258af4407de Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 28 Apr 2024 01:36:55 -0400
+Subject: [PATCH] fix obvious typo causing out of bounds memory access
+
+The size in the .h file doesn't match the loop access in the .c file.
+Detected via LTO and -Waggressive-loop-optimizations
+---
+ wmCalendar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wmCalendar.c b/wmCalendar.c
+index bf5640b..bfe68a1 100644
+--- a/wmCalendar.c
++++ b/wmCalendar.c
+@@ -71,7 +71,7 @@ void initValues(){
+     for(i = 0; i < 12; ++i) 
+ 	for( j = 0; j < 6; ++j)
+ 	    xdMonth[j][i] = xeMonth[j][i] - xsMonth[j][i] + 1;
+-    for(i = 0; i < 12; ++i) 
++    for(i = 0; i < 10; ++i)
+ 	for( j = 0; j < 2; ++j)
+ 	    xdYear[j][i] = xeYear[j][i] - xsYear[j][i] + 1;
+     for(i = 0; i < MAXBUTTON; ++i) 
+-- 
+2.43.2
+
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-c99.patch b/x11-plugins/wmcalendar/files/wmcalendar-c99.patch
new file mode 100644
index 000000000000..fb37477108cd
--- /dev/null
+++ b/x11-plugins/wmcalendar/files/wmcalendar-c99.patch
@@ -0,0 +1,63 @@
+From eb19c3c29d65b4e0e4f30d49c568846296ea4287 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Fri, 29 Mar 2024 10:21:50 -0400
+Subject: [PATCH 1/2] fix missing includes/prototypes that violate c99
+
+Fixes various -Werror=implicit-function-declaration issues.
+---
+ calendar.c | 2 ++
+ calendar.h | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/calendar.c b/calendar.c
+index 4da3650..c847853 100644
+--- a/calendar.c
++++ b/calendar.c
+@@ -1,4 +1,6 @@
+ #include "calendar.h"
++#include "settings.h"
++#include "calendarfunc.h"
+ 
+ time_t  modtime;
+ struct  calobj* calRoot;
+diff --git a/calendar.h b/calendar.h
+index bc9e576..7803d0c 100644
+--- a/calendar.h
++++ b/calendar.h
+@@ -33,4 +33,5 @@ int  getDayType(struct icaltimetype dt);
+ int  calcDayType(struct icaltimetype dt);
+ char* read_stream(char *s, size_t size, void *d);
+ void checkicalversion();
++int eventOnDay(struct icaltimetype dt, struct calobj* it);
+ 
+-- 
+2.43.2
+
+
+From a6f7c549f79a8fa50456f06352a3fd1457937c62 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 28 Apr 2024 01:34:58 -0400
+Subject: [PATCH 2/2] cast a struct pointing to itself to avoid
+ -Werror=incompatible-pointer-types
+
+This is already done the other way around at the beginning of the block.
+---
+ calendar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/calendar.c b/calendar.c
+index c847853..f8f875b 100644
+--- a/calendar.c
++++ b/calendar.c
+@@ -326,7 +326,7 @@ void deleteCalObjs(){
+ 	free(calRoot->text);
+ 	free(calRoot->comp);
+ 	free(calRoot);
+-	calRoot = help;
++	calRoot = (struct calobj*) help;
+     }
+     for(i = 0; i < 32; i++)
+ 	datetype[i][1] = 0;
+-- 
+2.43.2
+
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r3.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r3.ebuild
new file mode 100644
index 000000000000..11e9ef939e71
--- /dev/null
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="a calendar dockapp"
+HOMEPAGE="https://wmcalendar.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/libical
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( ../{BUGS,CHANGES,HINTS,README,TODO} )
+
+S=${WORKDIR}/${P}/Src
+
+PATCHES=( "${FILESDIR}"/${P}-exit-sin-and-cos.patch
+	"${FILESDIR}"/${P}-rename_kill_func.patch
+	"${FILESDIR}"/${P}-ical.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/wmcalendar-c99.patch
+	"${FILESDIR}"/0001-fix-obvious-typo-causing-out-of-bounds-memory-access.patch
+)
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	default
+}