Compare commits

...
Sign in to create a new pull request.

19 commits

Author SHA1 Message Date
nmontero
b7316319ef Update to 49.2 2026-08-12 12:07:59 +02:00
David King
16463a79f5 Fix build against recent gtk4 2026-07-24 23:00:03 +01:00
Fedora Release Engineering
0383ea27d4 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:34:11 +00:00
Milan Crha
702cc3f7da Switch to gnome-srpm-macros macros
[skip changelog]
2026-07-03 11:23:04 +02:00
Michael Catanzaro
8446d35cde Update to 49.1 2026-05-06 12:11:16 -05:00
Jan Grulich
9c1bab774b Add configuration for release-monitoring 2026-03-25 14:31:53 +01:00
Milan Crha
c039bec76a Update License tag to SPDX
[skip changelog]
2026-03-24 14:03:32 +01:00
Jan Grulich
c163152846 Packit: drop upstream_project_url and rely on release-monitoring only 2026-03-02 09:57:11 +01:00
Jan Grulich
56f9bc9eca Packit: drop fast_forward_merge_into as current stable branches diverge 2026-02-25 12:57:57 +01:00
Jan Grulich
24be5bac48 Onboard to Packit for stable Fedora branches 2026-02-24 08:36:09 +01:00
Fedora Release Engineering
8f8ee6bc68 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 21:01:45 +00:00
Michael Catanzaro
f75a09275e Update to 49.0 2025-09-15 10:42:45 -05:00
Michael Catanzaro
dda78ba4a3 Remove libhandy requires
This app is GTK 4 now. libhandy is GTK 3.
2025-09-08 12:39:41 -05:00
Michael Catanzaro
ef9bc5fd03 Remove libtool archive removal
We are meson now.
2025-09-08 12:38:59 -05:00
Michael Catanzaro
49f4e68b6b Update to 49.rc 2025-09-05 16:46:38 -05:00
Michael Catanzaro
04783ad24f Port to rpm-autospec 2025-09-05 16:34:13 -05:00
Marek Kasik
eb2c84eb26 Update to 49.beta 2025-08-05 13:00:01 +02:00
Fedora Release Engineering
a703e397c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:11:50 +00:00
Milan Crha
ae4d8de2fd Update to 42.3 2025-07-09 12:06:36 +02:00
8 changed files with 1148 additions and 1238 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/yelp-*.tar.bz2
/yelp-*.tar.xz
/yelp-*-build

40
.packit.yaml Normal file
View file

@ -0,0 +1,40 @@
# Minimal Packit Configuration for GNOME Packages
# Copy this to your dist-git repository as .packit.yaml
#
# Prerequisites:
# - Package is monitored by release-monitoring.org
# - Monitoring status set to "Monitoring" in dist-git
jobs:
# Automated updates for stable branches
- job: pull_from_upstream
trigger: release
dist_git_branches:
- fedora-stable
# ========================================================================
# VERSIONING: Choose ONE option based on your package's versioning scheme
# ========================================================================
# OPTION A: Major version only - allows minor and patch updates
# For 2-digit: 50.0 -> 50.1 ✅, 50.x -> 51.0 ❌
# For 3-digit: 1.2.3 -> 1.3.0 ✅, 1.x.x -> 2.0.0 ❌
# Use for: GNOME apps/libs with 2-digit versions, or libraries following semver
version_update_mask: '^\d+\.'
# OPTION B: Major.minor version - patch updates only
# Examples: 1.2.3 -> 1.2.4 ✅, 1.2.x -> 1.3.0 ❌
# Use for: Libraries with ABI concerns, even/odd development scheme
# version_update_mask: '^\d+\.\d+\.'
# Build in Koji after merge
- job: koji_build
trigger: commit
dist_git_branches:
- fedora-stable
# Submit Bodhi update
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-stable

View file

@ -1,26 +0,0 @@
From c323dd5087a15cb2b820fedf311ca288ec347878 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 8 Nov 2012 22:57:12 -0500
Subject: [PATCH] Center new windows
This makes more sense than letting mutter put them in the top
left corner.
---
src/yelp-application.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/yelp-application.c b/src/yelp-application.c
index 2d004c2..e669661 100644
--- a/src/yelp-application.c
+++ b/src/yelp-application.c
@@ -444,6 +444,7 @@ application_uri_resolved (YelpUri *uri,
g_settings_get (settings, "geometry", "(ii)", &width, &height);
window = yelp_window_new (data->app);
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_default_size (GTK_WINDOW (window), width, height);
g_signal_connect (window, "resized", G_CALLBACK (window_resized), data->app);
priv->windows = g_slist_prepend (priv->windows, window);
--
1.7.12.1

1069
changelog Normal file

File diff suppressed because it is too large Load diff

13
monitoring.toml Normal file
View file

@ -0,0 +1,13 @@
# Enable/disable monitoring
monitoring = true
# Enable/disable filling bugzilla ticket for new release
# When disabled it will also disable scratch builds
bugzilla = false
# Enable/disable reporting only stable versions
# Stable versions are recognized based on release-monitoring.org project settings
stable_only = true
# Enable/disable reporting all new versions instead of the latest one
# Enabling this will disable scratch builds
all_versions = true
# Enable/disable scratch build for newly opened version
scratch_build = false

View file

@ -1 +1 @@
SHA512 (yelp-42.2.tar.xz) = 7fd8da347b3cdb9b24a31eebe14c4964c5e41956caa2b79e70d6ea0c829d94f8428bbd96a2472c02d56673ca0ed1c75f7c6f874a59c4eea0b1440918a99969f4
SHA512 (yelp-49.2.tar.xz) = 8cca0fbc0b8bdf8d1881c408ef1b4d4f008fc05631b7a50b97288fdb11d1e06fe8ffc268354a23e6f59b76dd3d390759e25e5aa93cac6a487d09c2eb7665564c

View file

@ -1,118 +0,0 @@
From 7ecd58dc0ca7bf9d0acb00bf04194a0cb6e8b724 Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@gnome.org>
Date: Fri, 18 Apr 2025 11:33:01 -0400
Subject: [PATCH] Initial fix for CVE-2025-3155 from parrot409
https://gitlab.gnome.org/GNOME/yelp/-/issues/221
---
data/xslt/mal2html.xsl.in | 5 +++++
data/xslt/man2html.xsl.in | 2 +-
data/xslt/yelp-common.xsl.in | 7 +++++++
libyelp/yelp-transform.c | 19 +++++++++++++++++++
libyelp/yelp-view.c | 2 +-
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/data/xslt/mal2html.xsl.in b/data/xslt/mal2html.xsl.in
index 9e44b734..0a74da55 100644
--- a/data/xslt/mal2html.xsl.in
+++ b/data/xslt/mal2html.xsl.in
@@ -19,6 +19,11 @@
<xsl:param name="mal.link.prefix" select="'xref:'"/>
<xsl:param name="mal.link.extension" select="''"/>
+<xsl:template name="html.head.top.custom">
+ <xsl:param name="node" select="."/>
+ <meta http-equiv="Content-Security-Policy" content="default-src bogus-ghelp: bogus-gnome-help: bogus-help: bogus-help-list: bogus-info: bogus-man: ; script-src 'nonce-{$html.csp.nonce}'; style-src 'nonce-{$html.csp.nonce}'; "/>
+</xsl:template>
+
<xsl:template name="mal.link.target.custom">
<xsl:param name="node" select="."/>
<xsl:param name="action" select="$node/@action"/>
diff --git a/data/xslt/man2html.xsl.in b/data/xslt/man2html.xsl.in
index 676ce3eb..56bc1f5c 100644
--- a/data/xslt/man2html.xsl.in
+++ b/data/xslt/man2html.xsl.in
@@ -131,7 +131,7 @@
the correct styling and a single character which we measure the
width of and update each sheet as required.
-->
-<script type="text/javascript" language="javascript">
+<script type="text/javascript" language="javascript" nonce="{$html.csp.nonce}">
<xsl:text>
$(document).ready (function () {
var div = document.getElementById("invisible-char");
diff --git a/data/xslt/yelp-common.xsl.in b/data/xslt/yelp-common.xsl.in
index 0c1ec9bb..421fc02d 100644
--- a/data/xslt/yelp-common.xsl.in
+++ b/data/xslt/yelp-common.xsl.in
@@ -15,6 +15,13 @@
<xsl:param name="html.syntax.highlight" select="true()"/>
<xsl:param name="html.js.root" select="'file://@XSL_JSDIR@/'"/>
+<xsl:param name="html.csp.nonce" select="yelp:generate_nonce()"/>
+
+<xsl:template name="html.head.top.custom">
+ <xsl:param name="node" select="."/>
+ <meta http-equiv="Content-Security-Policy" content="default-src bogus-ghelp: bogus-gnome-help: bogus-help: bogus-help-list: bogus-info: bogus-man: ; script-src 'nonce-{$html.csp.nonce}'; style-src 'unsafe-inline'; "/>
+</xsl:template>
+
<xsl:template name="html.js.mathjax">
<xsl:param name="node" select="."/>
<xsl:if test="$node//mml:*[1]">
diff --git a/libyelp/yelp-transform.c b/libyelp/yelp-transform.c
index e74eb463..2ce1d05b 100644
--- a/libyelp/yelp-transform.c
+++ b/libyelp/yelp-transform.c
@@ -71,6 +71,8 @@ static void xslt_yelp_cache (xsltTransformContextPtr ctxt,
xsltStylePreCompPtr comp);
static void xslt_yelp_aux (xmlXPathParserContextPtr ctxt,
int nargs);
+static void xslt_yelp_generate_nonce (xmlXPathParserContextPtr ctxt,
+ int nargs);
enum {
PROP_0,
@@ -412,6 +414,10 @@ transform_run (YelpTransform *transform)
BAD_CAST "input",
BAD_CAST YELP_NAMESPACE,
(xmlXPathFunction) xslt_yelp_aux);
+ xsltRegisterExtFunction (priv->context,
+ BAD_CAST "generate_nonce",
+ BAD_CAST YELP_NAMESPACE,
+ (xmlXPathFunction) xslt_yelp_generate_nonce);
priv->output = xsltApplyStylesheetUser (priv->stylesheet,
priv->input,
@@ -607,3 +613,16 @@ xslt_yelp_aux (xmlXPathParserContextPtr ctxt, int nargs)
xsltExtensionInstructionResultRegister (tctxt, ret);
valuePush (ctxt, ret);
}
+
+static void
+xslt_yelp_generate_nonce (xmlXPathParserContextPtr ctxt, int nargs)
+{
+ GRand* rand;
+ gchar* nonce_str;
+
+ rand = g_rand_new ();
+ nonce_str = g_strdup_printf("%08x%08x", g_rand_int (rand), g_rand_int (rand));
+ xmlXPathReturnString (ctxt, xmlStrdup ((xmlChar *) nonce_str));
+ g_free(nonce_str);
+ g_rand_free(rand);
+}
diff --git a/libyelp/yelp-view.c b/libyelp/yelp-view.c
index 32ae131e..d544c5df 100644
--- a/libyelp/yelp-view.c
+++ b/libyelp/yelp-view.c
@@ -971,7 +971,7 @@ view_external_uri (YelpView *view,
if (app_info)
{
- if (!strstr (g_app_info_get_executable (app_info), "yelp"))
+ if (!strstr (g_app_info_get_executable (app_info), "yelp") && !strstr (struri, "%3C") && !strstr (struri, "%3E"))
{
GList l;
--
GitLab

1117
yelp.spec

File diff suppressed because it is too large Load diff