Compare commits

...

236 Commits
f18 ... master

Author SHA1 Message Date
Kalev Lember
f9fbe5a4c8 Backport upstream patches to fix invalid use of volatile objects
This is needed for gcc 11.
2020-11-24 12:25:45 +01:00
Michael Catanzaro
a6c366328b Make GnuTLS patch RHEL-specific, and make glib2-static subpackage Fedora-specific 2020-11-11 09:45:07 -06:00
Michael Catanzaro
f52f413589 Use GnuTLS to implement GHmac (thanks to Colin Walters) 2020-11-10 16:52:14 -06:00
Michael Catanzaro
78bc3e5c67 Remove unused script 2020-11-09 15:51:23 -06:00
Michael Catanzaro
8f38a70fd6 Backport fix for GSocketClient crash 2020-11-04 08:03:37 -06:00
Kalev Lember
74300be378 Update to 2.67.0 2020-10-29 05:56:07 +01:00
Kalev Lember
9b1f9aa2f2 Drop gtk-doc patch as we finally have a new enough gtk-doc 2020-10-19 19:12:40 +02:00
Kalev Lember
b5748c4edb Update to 2.66.2 2020-10-19 19:12:38 +02:00
Michael Catanzaro
6c5949a8ca Use smaller patches for the timezone issues
Someone just found a bug in the big version of the fix, so let's use a
smaller fix until these are both accepted upstream.
2020-10-14 15:31:02 -05:00
Michael Catanzaro
62d0b8f09a Fix yet another timezone bug 2020-10-14 15:03:56 -05:00
Michael Catanzaro
ce0559a035 Fix timezone-related bugs in many applications caused by new glib timezone cache 2020-10-14 14:42:56 -05:00
Kalev Lember
22bd71a65a Update to 2.66.1 2020-10-01 19:43:57 +02:00
Kalev Lember
6248b5a00a Update to 2.66.0 2020-09-10 20:48:04 +02:00
Kalev Lember
e1ea8b2fcf Update to 2.65.3 2020-09-02 18:52:53 +02:00
Adam Williamson
c3df0e5227 Backport fix for GGO #2189 (error accessing some filesystems)
Upstream commit refers only to read-only filesystems, but the
bug also affects CIFS shares (and this patch fixes that case
too).
2020-08-25 11:55:46 -07:00
Jeff Law
683c99b0e4 Re-enable LTO 2020-08-20 22:01:12 -06:00
Kalev Lember
1d384aa8fb Update to 2.65.2 2020-08-18 15:59:19 +02:00
Kalev Lember
b03aa2af4a Update to 2.65.1 2020-08-17 12:40:50 +02:00
Fedora Release Engineering
7a981e97c7 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 01:55:39 +00:00
Fedora Release Engineering
ea83fb0237 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 20:13:29 +00:00
Jeff Law
06a3cf31cd Disable LTO 2020-06-30 14:05:05 -06:00
Kalev Lember
ee2a246925 Update gio-2.0.pc with correct gio-querymodules name when renaming it
https://bugzilla.redhat.com/show_bug.cgi?id=1849441
2020-06-22 12:12:39 +02:00
Kalev Lember
6e6595e611 Avoid requiring a too new gtk-doc version for building glib
We don't have new enough gtk-doc in rawhide yet.
2020-06-22 11:57:28 +02:00
Kalev Lember
fbd5247c7a Remove changelog trimming
Changelogs are now trimmed globally.
2020-06-22 10:40:07 +02:00
Kalev Lember
46f4926d2c Update to 2.65.0 2020-06-22 10:39:45 +02:00
Kalev Lember
d43d0ce458 Update to 2.64.3 2020-05-20 13:15:37 +02:00
Tomas Popela
ec78e22b1b Backport fix for a race condition in GCancellable (rhbz#1825230) 2020-04-28 08:20:28 +02:00
Kalev Lember
ba78ee1988 Update to 2.64.2 2020-04-10 12:12:46 +02:00
Kalev Lember
cf59eebaca Update to 2.64.1 2020-03-11 13:54:06 +01:00
Kalev Lember
1ac207bef9 Update to 2.64.0 2020-03-02 20:48:36 +01:00
Kalev Lember
898c00b2ad Update to 2.63.6 2020-02-24 23:09:56 +02:00
Kalev Lember
a23372a417 Backport a patch to work around SELinux policies not allowing SYS_sched_setattr
https://bugzilla.redhat.com/show_bug.cgi?id=1795524
2020-02-12 20:50:27 +01:00
Michael Catanzaro
fdfddfe804 Add patch for CVE-2020-6750 and related issues. 2020-02-07 15:09:22 -06:00
Kalev Lember
807f65d4bd Update to 2.63.5 2020-02-03 11:13:07 +01:00
Stephen Gallagher
ab00509fe1
Fix GThreadPool initialization that is breaking createrepo_c (BZ #1795052)
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-01-29 10:11:54 -05:00
Fedora Release Engineering
af14559f8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 22:10:02 +00:00
Kalev Lember
e992d2d872 Update to 2.63.4 2020-01-24 05:28:49 +01:00
Kalev Lember
540aeada95 Update to 2.63.3 2019-12-16 15:20:37 +01:00
Kalev Lember
cfb57c36bc Update to 2.63.2 2019-12-02 06:24:39 +01:00
Kalev Lember
348b2bb6ec Update to 2.63.0 2019-10-04 16:50:57 +02:00
Kalev Lember
0085371da8 Update to 2.62.1 2019-10-04 14:04:04 +02:00
Kalev Lember
927ce866ba Update to 2.62.0 2019-09-06 09:34:17 +02:00
Kalev Lember
3f77266cf6 Update to 2.61.3 2019-09-03 11:39:52 +02:00
Kalev Lember
80b2df57b6 Update to 2.61.2 2019-08-12 11:27:51 +02:00
Fedora Release Engineering
9558681601 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 03:41:12 +00:00
Kalev Lember
dd3956be01 Drop bash completion permission changing hack
This has been fixed upstream.
2019-07-09 14:41:30 +03:00
David King
f45e5da632 Consistently use buildroot macro
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_using_buildroot_and_optflags_vs_rpm_build_root_and_rpm_opt_flags
2019-06-11 09:06:50 +01:00
David King
aafbdc7a3c Remove unused patch 2019-06-11 09:04:53 +01:00
David King
e81b0cb6f7 Fix CVE-2019-12450 (#1719142) 2019-06-11 09:04:42 +01:00
Kalev Lember
d40813ab05 Update to 2.61.1 2019-05-24 20:06:10 +02:00
Adam Williamson
0f797a67d7 Rebuild with Meson fix for #1699099 2019-04-16 10:02:44 -07:00
Kalev Lember
8b0b09cbeb Update to 2.61.0 2019-04-15 17:05:48 +02:00
Kalev Lember
46304cbb85 Update to 2.60.1 2019-04-15 16:14:33 +02:00
Zbigniew Jędrzejewski-Szmek
12007a228d Switch back to timestamp-based invalidation mode but fix seed
It turns out the hashed-based invalidation mode is buggy.
2019-03-13 10:13:50 +01:00
Zbigniew Jędrzejewski-Szmek
de2e4aad98 Switch to explicit byte compilation to override invalidation mode 2019-03-06 15:44:10 +01:00
Zbigniew Jędrzejewski-Szmek
789d0acce0 Make sure all .py files have fixed timestamps 2019-03-06 13:33:00 +01:00
Kalev Lember
66f00fe02c Update to 2.60.0 2019-03-04 22:48:12 +01:00
Kalev Lember
8594386f06 Update to 2.59.3 2019-02-18 10:37:38 +01:00
Kalev Lember
0660fa0c94 Update to 2.59.2 2019-02-04 17:33:58 +01:00
Fedora Release Engineering
b0612ed4ec - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 22:40:03 +00:00
Kalev Lember
f877f72c6a Update to 2.59.1 2019-01-26 15:24:09 +01:00
Kalev Lember
1cc525296d Add a conflict with older gcr versions
glib 2.59.0 hash table changes broke gcr versions older than 3.28.1. Add
an explicit conflict to make sure dnf updates these in lock step.
2019-01-21 12:17:48 +01:00
Kalev Lember
9f7e13d0db Switch to the meson build system 2019-01-03 13:57:37 +01:00
Kalev Lember
cbe7cdc693 Add missing gcc and gcc-c++ build deps 2019-01-03 13:30:29 +01:00
Kalev Lember
118876b458 Update to 2.59.0 2019-01-03 12:20:01 +01:00
Kalev Lember
aedd1304a1 Update to 2.58.2 2018-12-18 15:30:27 +01:00
Miro Hrončok
6070ee78fb https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 2018-11-15 12:53:55 +01:00
Kalev Lember
4acd8adcda Fix multilib -devel installs
This time the issue was that the glib build system generates
bytecompiled python files during make install, so the 'touch -r' that's
after make install didn't take effect. Fix this by removing the
bytecompiled files after make install, and let rpmbuild brp scripts
regenerate them again afterwards.

https://bugzilla.redhat.com/show_bug.cgi?id=1634778
2018-10-05 09:54:32 +02:00
Kalev Lember
03b8b8e2e3 Update to 2.58.1 2018-09-21 16:45:27 +02:00
Kalev Lember
5d7683bd2f Merge branch 'master' into f29 2018-09-05 17:23:07 +02:00
Kalev Lember
e17445b580 Sort %files list 2018-09-05 16:37:05 +02:00
Kalev Lember
8772f8141f Update to 2.58.0 2018-09-05 16:36:01 +02:00
Colin Walters
9a01b6006b Add --disable-silent-rules
To make it easier to debug build issues.
2018-08-27 09:39:30 -04:00
Ondrej Holy
96178709bd Update to 2.57.2 2018-08-02 11:13:04 +02:00
Ondrej Holy
61bd4d25e7 Update to 2.57.1 2018-07-20 15:50:57 +02:00
Fedora Release Engineering
38b0fc282d - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 02:34:01 +00:00
Miro Hrončok
fdc1cc9df5 Rebuilt for Python 3.7 2018-06-19 10:43:50 +02:00
Debarshi Ray
9c3ca0aa8b Backport patch to fix possible invalid pointer in dbus callback
... in the FD.o notification backend

https://bugzilla.redhat.com/show_bug.cgi?id=1584916
https://gitlab.gnome.org/GNOME/glib/merge_requests/90
https://gitlab.gnome.org/GNOME/glib/merge_requests/102
2018-06-14 15:34:42 +02:00
Kalev Lember
6c43ffbb6e Rely on %make_install overriding INSTALL, instead of doing it ourselves 2018-05-27 14:18:20 +02:00
Kalev Lember
dea8a050cc Fix multilib -devel installs (#1581067)
We are patching one of the .py files, which is causing the timestamp to
be slightly off in different builds, which in turn gets baked into .pyc
files. Work this around by using another file's timestamp for the
patched .py file.
2018-05-27 14:16:21 +02:00
Fabio Valentini
4c1e2ebdaa
include upstream patch to fix gdbus-codegen with meson 0.46 2018-05-13 15:06:56 +02:00
Kalev Lember
98d0423b58 Update to 2.56.1 2018-04-08 22:23:09 +02:00
Kalev Lember
cda7784363 Update to 2.56.0 2018-03-12 22:36:00 +01:00
Igor Gnatenko
9b6973c83d
remove glib-compile-schemas for /app
It's not in Fedora guidelines and even if it would be there, it would
require separate trigger.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-11 17:36:39 +01:00
Igor Gnatenko
2bf83454cd
Undo disabling mangling
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-07 18:31:09 +01:00
Kalev Lember
2cdd991d06 Disable brp-mangle-shebangs shebangs
It suddenly started creating broken /usr/bin//usr/bin/python3 shebangs,
making glib2-devel uninstallable.
2018-02-07 04:26:11 +01:00
Kalev Lember
fd6c7196f2 Drop ldconfig scriptlets 2018-02-07 03:24:24 +01:00
Kalev Lember
ad56827ff1 Update to 2.55.2 2018-02-07 03:24:24 +01:00
Igor Gnatenko
14f6fc54a9 Switch to %ldconfig_scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-31 17:34:41 +01:00
Kalev Lember
087ef3ba0f gmain: Partial revert of recent wakeup changes
https://bugzilla.gnome.org/show_bug.cgi?id=761102
2018-01-18 12:47:19 +01:00
Kalev Lember
903f77fb2d Drop upstreamed systemtap multilib fix 2018-01-08 21:43:21 +01:00
Kalev Lember
acd3cbe4d5 Update to 2.55.1 2018-01-08 21:35:29 +01:00
Kalev Lember
0ce8af8d61 Update to 2.55.0 2017-12-19 10:26:26 +01:00
Kalev Lember
1267711fed Update to 2.54.2 2017-11-01 16:14:30 +01:00
Kalev Lember
9c81d716d8 Update to 2.54.1 2017-10-06 20:21:53 +02:00
Kalev Lember
a462f9ad53 Update to 2.54.0 2017-09-11 07:15:36 +02:00
Kalev Lember
a26ff7ab92 Update to 2.53.7 2017-09-05 22:24:42 +02:00
Kalev Lember
bdba4a7a70 Update to 2.53.6 2017-08-19 18:08:12 +02:00
Igor Gnatenko
d7233f80ab trivial: use better macro for make (install) provided by RPM
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2017-08-07 22:45:34 +02:00
Igor Gnatenko
78ad5e06b9 Update to 2.53.5
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2017-08-07 22:45:26 +02:00
Kalev Lember
7601a56f32 Backport glib-mkenums flags annotation parsing fixes 2017-08-01 22:54:29 +01:00
Fedora Release Engineering
52c8682ec3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 10:19:53 +00:00
Kalev Lember
8a2874adbc Revert a GKeyFile introspection ABI change 2017-07-21 19:00:31 +02:00
Kalev Lember
9d1a02789c Update to 2.53.4 2017-07-18 10:24:36 +02:00
Kalev Lember
712673e983 Update to 2.53.3 2017-06-22 17:53:14 +02:00
Owen W. Taylor
a93430c4ec Make triggers also compile schemas in /app/share/glib-2.0/schemas 2017-06-08 21:46:35 -04:00
Florian Müllner
c120a31c5c Update to 2.53.2 2017-05-24 23:19:47 +02:00
Kalev Lember
15854645a4 Backport a gmain GWakeup patch to fix timedatex high CPU usage
https://bugzilla.redhat.com/show_bug.cgi?id=1450628
2017-05-15 10:54:10 +02:00
Kalev Lember
ca7ad47973 Update to 2.52.2 2017-05-09 16:04:57 +02:00
Colin Walters
05d466c2f3 Backport patches for gmain wakeup for qemu
See: https://bugzilla.gnome.org/show_bug.cgi?id=761102
2017-04-11 12:06:05 -04:00
Colin Walters
020ac281a0 Explictly remove PCRE sources
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1324770
2017-04-11 11:15:20 -04:00
Kalev Lember
28d80c00df Update to 2.52.1 2017-04-11 14:33:29 +02:00
Kalev Lember
801e4a1ba0 Don't use full path for triggers
rpm already sets a sufficiently narrow PATH for all scripts and there's
no need to further confine them.
2017-03-20 11:06:22 +01:00
Kalev Lember
13e91f1191 Update to 2.52.0 2017-03-20 10:32:52 +01:00
Kalev Lember
3d2fdcc93f Update to 2.51.5 2017-03-16 17:02:32 +01:00
Kalev Lember
d0061dc774 Remove the dependency on dbus-launch again
This would have forced an X11 dependency for all of the low level
programs that link with glib, which is a no go.

The dbus dependency needs to be added in apps that use the functionality
instead.

https://bugzilla.redhat.com/show_bug.cgi?id=927212
2017-03-02 09:38:50 +01:00
David King
9212218622 Use pkgconfig for BuildRequires
https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires
2017-03-01 22:37:01 +00:00
David King
c61950e22a Add a Requires on dbus-launch (#927212) 2017-03-01 22:36:58 +00:00
David King
d6f26ff142 Update to 2.51.4 2017-03-01 22:36:38 +00:00
Richard Hughes
0a852c03e0 Update to 2.51.3 2017-02-27 20:31:22 +00:00
Richard Hughes
521a0af72d Update to 2.51.2 2017-02-14 12:38:15 +00:00
Richard Hughes
6eddb09ca7 Fix filelists 2017-02-13 13:14:22 +00:00
Richard Hughes
de68b09821 Update to 2.51.1 2017-02-13 13:02:29 +00:00
Fedora Release Engineering
6ebc67f953 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 11:07:01 +00:00
Miro Hrončok
66ce32f8f6 Rebuild for Python 3.6 2016-12-19 18:20:36 +01:00
Kalev Lember
909ce71f92 Update to 2.51.0 2016-10-30 11:57:16 +01:00
Kalev Lember
590ba0a7c2 Update to 2.50.1 2016-10-12 16:43:02 +02:00
Kalev Lember
f0e37d48aa Drop license redefinition
This shouldn't be needed for neither Fedora nor RHEL any more.
2016-09-28 14:42:45 +02:00
Kalev Lember
b667522807 Update to 2.50.0 2016-09-19 16:43:20 +02:00
Kalev Lember
f19e684016 Use standard tag order in the spec file 2016-09-13 09:46:00 +02:00
Kalev Lember
49888f2247 Don't set group tags
They are unused in Fedora.
2016-09-13 09:43:53 +02:00
Kalev Lember
050e056f1a Update to 2.49.7 2016-09-13 09:43:12 +02:00
Kalev Lember
6fa82410a9 Update to 2.49.6 2016-08-28 20:42:16 +02:00
Kalev Lember
720a3c04d3 Own /usr/share/gdb and /usr/share/systemtap directories
... to avoid leaving behind empty directories after uninstalling
glib2-devel.
2016-08-18 08:42:40 +02:00
Kalev Lember
8c1e113e30 Update to 2.49.5 2016-08-18 07:58:14 +02:00
Miro Hrončok
95c4ff00c9 Use Python 3 for the RPM Python byte compilation 2016-08-16 13:40:19 +02:00
Ville Skyttä
bd79cc7078 Switch to Python 3 2016-08-16 12:49:18 +02:00
Kalev Lember
3988005eba Update to 2.49.4 2016-07-21 08:46:05 +02:00
Kalev Lember
e80d9926c8 Update to 2.49.3 2016-07-17 21:43:15 +02:00
Petr Písař
33893e2564 Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl> 2016-06-24 10:36:17 +02:00
Richard Hughes
edffddfc65 Update to 2.49.2 2016-06-22 11:14:47 +01:00
Yaakov Selkowitz
87058bdf9c Soften shared-mime-info dependency (#1266118) 2016-06-01 14:47:02 -05:00
Florian Müllner
65184ef400 Update to 2.49.1 2016-05-27 16:25:10 +02:00
Kalev Lember
4a9a2168b8 Update to 2.48.1 2016-05-10 11:40:49 +02:00
Colin Walters
c1a8bc0c27 Explicitly require system pcre, though we happened to default to this now
anyways due to something else pulling PCRE into the buildroot
  Closes rhbz#1287266
2016-04-06 16:38:25 -04:00
Kalev Lember
d2f294c971 Update to 2.48.0 2016-03-22 22:49:09 +01:00
Richard Hughes
8fe0a4919c trivial: Work around a broken tarball
Colin is just fixing this upstream now.
2016-03-17 14:02:35 +00:00
Richard Hughes
9a2f240e5e Update to 2.47.92 2016-03-17 10:09:54 +00:00
Colin Walters
7bda568479 git snapshot to work around https://bugzilla.gnome.org/show_bug.cgi?id=762637
- Add --with-python=/usr/bin/python explicitly to hopefully fix a weird
  issue I am seeing where librepo fails to build in epel7 with this due to
  us requiring /bin/python.
2016-02-24 15:41:00 -05:00
Richard Hughes
f441ba778e Update to 2.47.6 2016-02-17 10:01:18 +00:00
Dennis Gilmore
b409b5060b - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 22:04:28 +00:00
David King
78b0c0f225 Update to 2.47.5 2016-01-19 11:50:02 +00:00
Kalev Lember
30be49854c Update to 2.47.4 2015-12-16 16:52:53 +01:00
Kalev Lember
43ad60e20e Update to 2.47.3 2015-11-25 17:41:00 +01:00
Kalev Lember
5472a32d5c Update to 2.47.2 2015-11-25 08:53:02 +01:00
Kevin Fenzi
7473b58ac4 Add full path redirect output to null and || : to triggers. 2015-11-09 20:36:49 -07:00
Kalev Lember
cafbb83624 Update to 2.47.1 2015-10-28 08:16:09 +01:00
Kalev Lember
64b1fd19ea Backport an upstream fix for app launching under wayland
https://bugzilla.redhat.com/show_bug.cgi?id=1273146
2015-10-19 22:39:43 +02:00
Kalev Lember
135a12a11c Update to 2.46.1 2015-10-14 16:52:21 +02:00
Kalev Lember
8efb30daf8 Update to 2.46.0 2015-09-21 15:27:03 +02:00
Kalev Lember
ee9fe8145c Update to 2.45.8 2015-09-14 17:11:06 +02:00
Kalev Lember
90bf1b32b0 Update to 2.45.7 2015-09-01 18:19:15 +02:00
Kalev Lember
4235df9f60 Update to 2.45.6 2015-08-19 22:46:54 +02:00
Kalev Lember
8b343f3544 Update to 2.45.5 2015-08-19 22:10:26 +02:00
Matthias Clasen
6755798d12 Add file triggers 2015-08-14 11:55:58 -04:00
David King
2dcc4a3c39 Update to 2.45.4 2015-07-21 08:32:50 +01:00
Kalev Lember
33edb32972 Backport a patch to fix notification withdrawing in gnome-software 2015-06-24 11:15:08 +02:00
David King
37425187a1 Update to 2.45.3 2015-06-24 09:59:29 +01:00
Dennis Gilmore
bb5d4bcab2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 08:26:27 +00:00
David King
155dac13a7 Update to 2.45.2 2015-05-26 09:23:59 +01:00
Kalev Lember
aaaadfa0e3 Update to 2.45.1 2015-04-30 14:46:34 +02:00
Kalev Lember
a7cfb69290 Update to 2.44.0 2015-03-23 19:05:54 +01:00
Kalev Lember
5b9d4813fe Update to 2.43.92 2015-03-17 14:44:53 +01:00
Kalev Lember
18083219d7 Update to 2.43.91 2015-03-02 21:12:01 +01:00
Till Maas
79b7e1a5e5 Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
2015-02-21 22:25:36 +01:00
David King
cc555d1c72 Update man pages glob in files section
https://fedoraproject.org/wiki/Packaging:Guidelines#Manpages
2015-02-18 17:27:59 +00:00
David King
ff0cae3123 Update to 2.43.90 2015-02-18 17:26:11 +00:00
Matthias Clasen
3678fff388 2.43.4 2015-02-10 20:28:54 -05:00
David King
31b797e2a7 Update to 2.43.3 2015-01-20 08:22:53 +00:00
Kalev Lember
0766feafff Update to 2.43.2 2014-12-17 11:49:22 +01:00
Kalev Lember
fca95b7377 Update to 2.43.1 2014-11-25 11:11:47 +01:00
Florian Müllner
c894923a28 Update to 2.43.0 2014-10-31 10:55:51 +01:00
Kalev Lember
ee19c0cfd1 Update to 2.42.0 2014-09-22 20:02:16 +02:00
Kalev Lember
7173be9291 Update to 2.41.5 2014-09-16 09:24:56 +02:00
Matthias Clasen
2c8f4e7a31 Fix gdbus-peer test 2014-09-04 23:36:00 -04:00
Bastien Nocera
1759e582c5 Fix banshee getting selected as the default movie player 2014-09-04 19:57:15 +02:00
Kalev Lember
b45bc84b46 Update to 2.41.4 2014-09-02 23:02:04 +02:00
Kalev Lember
b106300330 Update to 2.41.3 2014-08-16 21:17:17 +02:00
Peter Robinson
82f0a6a1c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 16:44:37 +00:00
Stef Walter
d143a7bba6 Fix regression in encoding of array of doubles
rhbz#1122128
2014-07-23 09:33:03 -04:00
Kalev Lember
acaa117c64 Update to 2.41.2 2014-07-14 17:00:43 +02:00
Tom Callaway
2f6436c152 fix license handling 2014-07-12 11:12:45 -04:00
Richard Hughes
f4398cbb64 Update to 2.41.1 2014-06-24 12:56:51 +01:00
Dennis Gilmore
7ab7df4b4f - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 11:12:58 -05:00
Kalev Lember
94703bb293 Update to 2.41.0 2014-05-27 11:18:12 +02:00
Richard Hughes
062ae8743a Update to 2.40.0 2014-03-24 19:47:01 +00:00
Richard Hughes
73831db5f5 Update to 2.39.92 2014-03-18 13:43:46 +00:00
Richard Hughes
37f2e6a09b Update to 2.39.91 2014-03-04 14:21:55 +00:00
Richard Hughes
87399ddca1 Update to 2.39.90 2014-02-18 11:54:11 +00:00
Richard Hughes
9df1f592d1 Update to 2.39.4 2014-02-04 09:36:43 +00:00
Richard Hughes
af8f0d018f Update to 2.39.3 2014-01-14 09:09:15 +00:00
Richard W.M. Jones
8d1f2560de Re-add static subpackage so that we can build static qemu as
an AArch64 binfmt.
2013-12-22 20:58:19 +00:00
Richard Hughes
c83908386e Update to 2.39.2 2013-12-17 09:23:16 +00:00
Richard Hughes
5ccb823475 Backport a patch from master to stop gnome-settings-daemon crashing 2013-12-09 08:42:03 +00:00
Richard Hughes
6c0de58bfa Update to 2.39.1 2013-11-14 15:48:50 +00:00
Richard Hughes
0f1e253d42 Trim changelog to one year in length 2013-10-29 08:40:27 +00:00
Richard Hughes
3be72f99c3 Fix filelists 2013-10-29 08:40:11 +00:00
Richard Hughes
d247541600 Update to 2.39.0 2013-10-28 17:54:46 +00:00
Kalev Lember
aafdb1dc21 Update to 2.38.0 2013-09-24 22:01:13 +02:00
Kalev Lember
8cc88f501a Update to 2.37.93 2013-09-17 20:01:13 +02:00
Kalev Lember
2beaa32957 Update to 2.37.7 2013-09-02 22:25:54 +02:00
Debarshi Ray
9da0fb4b16 Update to 2.37.6 2013-08-21 18:48:44 +02:00
Petr Písař
ef9967724e Perl 5.18 rebuild 2013-08-03 13:40:35 +02:00
Debarshi Ray
7262b9bce8 Update to 2.37.5 2013-08-01 16:45:15 +02:00
Petr Písař
6dea828cc8 Perl 5.18 rebuild 2013-07-18 01:30:27 +02:00
Debarshi Ray
19a1f0d61e Remove rpath from gdbus-peer 2013-07-10 20:33:53 +02:00
Matthias Clasen
b95e4bd68c 2.37.4 2013-07-09 20:55:13 -04:00
Kalev Lember
50d046e3fd Fix the build
https://bugzilla.gnome.org/show_bug.cgi?id=700350
2013-06-20 19:48:48 +02:00
Debarshi Ray
b947f05ed6 Update to 2.37.2 2013-06-20 12:52:35 +02:00
Matthias Clasen
828dd098f4 Limit changelog 2013-06-08 23:29:22 -04:00
Matthias Clasen
25351c5075 2.37.1 2013-05-28 19:37:41 -04:00
Kalev Lember
2d0f25ec3e Update to 2.37.0 2013-05-03 22:11:01 +02:00
Thorsten Leemhuis
7bf8211082 Fix pidgin freezes by applying patch from master (#956872) 2013-04-29 18:21:37 +02:00
Kalev Lember
b661dad8c2 Update to 2.36.1 2013-04-16 00:13:07 +02:00
Kalev Lember
3d0d079e01 Update to 2.36.0 2013-03-25 22:55:49 +01:00
Matthias Clasen
a18eaa5d1e 2.35.9 2013-03-19 19:59:43 -04:00
Kalev Lember
15a6e4dc90 2.35.8 2013-02-20 23:27:55 +01:00
Kalev Lember
ca7460ddcc 2.35.7 2013-02-05 21:55:20 +01:00
Matthias Clasen
063ef24a33 2.35.4 2013-01-15 17:02:18 -05:00
Kalev Lember
43f421602c Update to 2.35.3 2012-12-20 20:31:49 +01:00
Kalev Lember
69da8037e4 Update to 2.35.2 2012-11-24 11:44:04 +01:00
Kalev Lember
3c181fd35e Update to 2.35.1
... and drop upstreamed codegen-in-datadir.patch.
2012-11-08 23:29:53 +01:00
Kalev Lember
995dd9991b Update to 2.34.1 2012-10-16 16:04:59 +02:00
Tomas Bzatek
7e37219787 Re-enable fam, put it in separate subpackage 2012-10-10 17:41:56 +02:00
Matthias Clasen
f328d62aff fix file list 2012-10-10 08:34:28 -04:00
Matthias Clasen
3d798c3fdc sync with f18, disable fam 2012-10-10 08:09:39 -04:00
6 changed files with 4698 additions and 966 deletions

3417
1719.patch Normal file

File diff suppressed because it is too large Load Diff

32
1728.patch Normal file
View File

@ -0,0 +1,32 @@
From c2b8fa8a34765d42be69e7eb9a4c44eeb970f775 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Wed, 28 Oct 2020 10:41:13 -0500
Subject: [PATCH] gsocketclient: fix crash when async connection step fails
This is a regression from !1686. The tmp_error is no longer valid after
it is "considered" and cannot be used at this point. We should print the
error earlier instead.
Fixes #2233
---
gio/gsocketclient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
index ce3c186fb..373774682 100644
--- a/gio/gsocketclient.c
+++ b/gio/gsocketclient.c
@@ -1837,9 +1837,9 @@ g_socket_client_connected_callback (GObject *source,
{
if (!g_cancellable_is_cancelled (attempt->cancellable))
{
+ g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
clarify_connect_error (data->error_info->tmp_error, data->connectable, attempt->address);
consider_tmp_error (data->error_info, G_SOCKET_CLIENT_CONNECTING);
- g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
connection_attempt_remove (attempt);
connection_attempt_unref (attempt);
try_next_connection_or_finish (data, FALSE);
--
GitLab

1526
glib2.spec

File diff suppressed because it is too large Load Diff

668
gnutls-hmac.patch Normal file
View File

@ -0,0 +1,668 @@
From afb5735506e2ed1c638a8c916aa3748bf0615f32 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 7 Jun 2019 18:44:43 +0000
Subject: [PATCH 1/2] ghmac: Split off wrapper functions into ghmac-utils.c
Prep for adding a GnuTLS HMAC implementation; these are just
utility functions that call the "core" API.
---
glib/ghmac-utils.c | 145 +++++++++++++++++++++++++++++++++++++++++++++
glib/ghmac.c | 112 ----------------------------------
glib/meson.build | 1 +
3 files changed, 146 insertions(+), 112 deletions(-)
create mode 100644 glib/ghmac-utils.c
diff --git a/glib/ghmac-utils.c b/glib/ghmac-utils.c
new file mode 100644
index 000000000..a17359ff1
--- /dev/null
+++ b/glib/ghmac-utils.c
@@ -0,0 +1,145 @@
+/* ghmac.h - data hashing functions
+ *
+ * Copyright (C) 2011 Collabora Ltd.
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include "ghmac.h"
+
+#include "glib/galloca.h"
+#include "gatomic.h"
+#include "gslice.h"
+#include "gmem.h"
+#include "gstrfuncs.h"
+#include "gtestutils.h"
+#include "gtypes.h"
+#include "glibintl.h"
+
+/**
+ * g_compute_hmac_for_data:
+ * @digest_type: a #GChecksumType to use for the HMAC
+ * @key: (array length=key_len): the key to use in the HMAC
+ * @key_len: the length of the key
+ * @data: (array length=length): binary blob to compute the HMAC of
+ * @length: length of @data
+ *
+ * Computes the HMAC for a binary @data of @length. This is a
+ * convenience wrapper for g_hmac_new(), g_hmac_get_string()
+ * and g_hmac_unref().
+ *
+ * The hexadecimal string returned will be in lower case.
+ *
+ * Returns: the HMAC of the binary data as a string in hexadecimal.
+ * The returned string should be freed with g_free() when done using it.
+ *
+ * Since: 2.30
+ */
+gchar *
+g_compute_hmac_for_data (GChecksumType digest_type,
+ const guchar *key,
+ gsize key_len,
+ const guchar *data,
+ gsize length)
+{
+ GHmac *hmac;
+ gchar *retval;
+
+ g_return_val_if_fail (length == 0 || data != NULL, NULL);
+
+ hmac = g_hmac_new (digest_type, key, key_len);
+ if (!hmac)
+ return NULL;
+
+ g_hmac_update (hmac, data, length);
+ retval = g_strdup (g_hmac_get_string (hmac));
+ g_hmac_unref (hmac);
+
+ return retval;
+}
+
+/**
+ * g_compute_hmac_for_bytes:
+ * @digest_type: a #GChecksumType to use for the HMAC
+ * @key: the key to use in the HMAC
+ * @data: binary blob to compute the HMAC of
+ *
+ * Computes the HMAC for a binary @data. This is a
+ * convenience wrapper for g_hmac_new(), g_hmac_get_string()
+ * and g_hmac_unref().
+ *
+ * The hexadecimal string returned will be in lower case.
+ *
+ * Returns: the HMAC of the binary data as a string in hexadecimal.
+ * The returned string should be freed with g_free() when done using it.
+ *
+ * Since: 2.50
+ */
+gchar *
+g_compute_hmac_for_bytes (GChecksumType digest_type,
+ GBytes *key,
+ GBytes *data)
+{
+ gconstpointer byte_data;
+ gsize length;
+ gconstpointer key_data;
+ gsize key_len;
+
+ g_return_val_if_fail (data != NULL, NULL);
+ g_return_val_if_fail (key != NULL, NULL);
+
+ byte_data = g_bytes_get_data (data, &length);
+ key_data = g_bytes_get_data (key, &key_len);
+ return g_compute_hmac_for_data (digest_type, key_data, key_len, byte_data, length);
+}
+
+
+/**
+ * g_compute_hmac_for_string:
+ * @digest_type: a #GChecksumType to use for the HMAC
+ * @key: (array length=key_len): the key to use in the HMAC
+ * @key_len: the length of the key
+ * @str: the string to compute the HMAC for
+ * @length: the length of the string, or -1 if the string is nul-terminated
+ *
+ * Computes the HMAC for a string.
+ *
+ * The hexadecimal string returned will be in lower case.
+ *
+ * Returns: the HMAC as a hexadecimal string.
+ * The returned string should be freed with g_free()
+ * when done using it.
+ *
+ * Since: 2.30
+ */
+gchar *
+g_compute_hmac_for_string (GChecksumType digest_type,
+ const guchar *key,
+ gsize key_len,
+ const gchar *str,
+ gssize length)
+{
+ g_return_val_if_fail (length == 0 || str != NULL, NULL);
+
+ if (length < 0)
+ length = strlen (str);
+
+ return g_compute_hmac_for_data (digest_type, key, key_len,
+ (const guchar *) str, length);
+}
diff --git a/glib/ghmac.c b/glib/ghmac.c
index 49fd272f0..4f181f21f 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -329,115 +329,3 @@ g_hmac_get_digest (GHmac *hmac,
g_checksum_update (hmac->digesto, buffer, len);
g_checksum_get_digest (hmac->digesto, buffer, digest_len);
}
-
-/**
- * g_compute_hmac_for_data:
- * @digest_type: a #GChecksumType to use for the HMAC
- * @key: (array length=key_len): the key to use in the HMAC
- * @key_len: the length of the key
- * @data: (array length=length): binary blob to compute the HMAC of
- * @length: length of @data
- *
- * Computes the HMAC for a binary @data of @length. This is a
- * convenience wrapper for g_hmac_new(), g_hmac_get_string()
- * and g_hmac_unref().
- *
- * The hexadecimal string returned will be in lower case.
- *
- * Returns: the HMAC of the binary data as a string in hexadecimal.
- * The returned string should be freed with g_free() when done using it.
- *
- * Since: 2.30
- */
-gchar *
-g_compute_hmac_for_data (GChecksumType digest_type,
- const guchar *key,
- gsize key_len,
- const guchar *data,
- gsize length)
-{
- GHmac *hmac;
- gchar *retval;
-
- g_return_val_if_fail (length == 0 || data != NULL, NULL);
-
- hmac = g_hmac_new (digest_type, key, key_len);
- if (!hmac)
- return NULL;
-
- g_hmac_update (hmac, data, length);
- retval = g_strdup (g_hmac_get_string (hmac));
- g_hmac_unref (hmac);
-
- return retval;
-}
-
-/**
- * g_compute_hmac_for_bytes:
- * @digest_type: a #GChecksumType to use for the HMAC
- * @key: the key to use in the HMAC
- * @data: binary blob to compute the HMAC of
- *
- * Computes the HMAC for a binary @data. This is a
- * convenience wrapper for g_hmac_new(), g_hmac_get_string()
- * and g_hmac_unref().
- *
- * The hexadecimal string returned will be in lower case.
- *
- * Returns: the HMAC of the binary data as a string in hexadecimal.
- * The returned string should be freed with g_free() when done using it.
- *
- * Since: 2.50
- */
-gchar *
-g_compute_hmac_for_bytes (GChecksumType digest_type,
- GBytes *key,
- GBytes *data)
-{
- gconstpointer byte_data;
- gsize length;
- gconstpointer key_data;
- gsize key_len;
-
- g_return_val_if_fail (data != NULL, NULL);
- g_return_val_if_fail (key != NULL, NULL);
-
- byte_data = g_bytes_get_data (data, &length);
- key_data = g_bytes_get_data (key, &key_len);
- return g_compute_hmac_for_data (digest_type, key_data, key_len, byte_data, length);
-}
-
-
-/**
- * g_compute_hmac_for_string:
- * @digest_type: a #GChecksumType to use for the HMAC
- * @key: (array length=key_len): the key to use in the HMAC
- * @key_len: the length of the key
- * @str: the string to compute the HMAC for
- * @length: the length of the string, or -1 if the string is nul-terminated
- *
- * Computes the HMAC for a string.
- *
- * The hexadecimal string returned will be in lower case.
- *
- * Returns: the HMAC as a hexadecimal string.
- * The returned string should be freed with g_free()
- * when done using it.
- *
- * Since: 2.30
- */
-gchar *
-g_compute_hmac_for_string (GChecksumType digest_type,
- const guchar *key,
- gsize key_len,
- const gchar *str,
- gssize length)
-{
- g_return_val_if_fail (length == 0 || str != NULL, NULL);
-
- if (length < 0)
- length = strlen (str);
-
- return g_compute_hmac_for_data (digest_type, key, key_len,
- (const guchar *) str, length);
-}
diff --git a/glib/meson.build b/glib/meson.build
index aaf40a218..b3bf067c7 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -253,6 +253,7 @@ glib_sources = files(
'ggettext.c',
'ghash.c',
'ghmac.c',
+ 'ghmac-utils.c',
'ghook.c',
'ghostutils.c',
'giochannel.c',
--
2.28.0
From 703e63f9d8b3ea4f26f41f0d2287b301025a73cc Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 7 Jun 2019 19:36:54 +0000
Subject: [PATCH 2/2] Add a gnutls backend for GHmac
For RHEL we want apps to use FIPS-certified crypto libraries,
and HMAC apparently counts as "keyed" and hence needs to
be validated.
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1630260
Replaces: https://gitlab.gnome.org/GNOME/glib/merge_requests/897
This is a build-time option that backs the GHmac API with GnuTLS.
Most distributors ship glib-networking built with GnuTLS, and
most apps use glib-networking, so this isn't a net-new library
in most cases.
mcatanzaro note: I've updated Colin's original patch to implement
g_hmac_copy() using gnutls_hmac_copy(), which didn't exist when Colin
developed this patch.
---
glib/gchecksum.c | 9 ++-
glib/gchecksumprivate.h | 32 ++++++++
glib/ghmac-gnutls.c | 164 ++++++++++++++++++++++++++++++++++++++++
glib/ghmac.c | 3 +
glib/meson.build | 10 ++-
meson.build | 7 ++
meson_options.txt | 5 ++
7 files changed, 224 insertions(+), 6 deletions(-)
create mode 100644 glib/gchecksumprivate.h
create mode 100644 glib/ghmac-gnutls.c
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index f8a3f9ab8..b391a6264 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -20,7 +20,7 @@
#include <string.h>
-#include "gchecksum.h"
+#include "gchecksumprivate.h"
#include "gslice.h"
#include "gmem.h"
@@ -173,9 +173,9 @@ sha_byte_reverse (guint32 *buffer,
}
#endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
-static gchar *
-digest_to_string (guint8 *digest,
- gsize digest_len)
+gchar *
+gchecksum_digest_to_string (guint8 *digest,
+ gsize digest_len)
{
gsize i, len = digest_len * 2;
gchar *retval;
@@ -194,6 +194,7 @@ digest_to_string (guint8 *digest,
return retval;
}
+#define digest_to_string gchecksum_digest_to_string
/*
* MD5 Checksum
diff --git a/glib/gchecksumprivate.h b/glib/gchecksumprivate.h
new file mode 100644
index 000000000..86c7a3b61
--- /dev/null
+++ b/glib/gchecksumprivate.h
@@ -0,0 +1,32 @@
+/* gstdioprivate.h - Private GLib stdio functions
+ *
+ * Copyright 2017 Руслан Ижбулатов
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __G_CHECKSUMPRIVATE_H__
+#define __G_CHECKSUMPRIVATE_H__
+
+#include "gchecksum.h"
+
+G_BEGIN_DECLS
+
+gchar *
+gchecksum_digest_to_string (guint8 *digest,
+ gsize digest_len);
+
+G_END_DECLS
+
+#endif
\ No newline at end of file
diff --git a/glib/ghmac-gnutls.c b/glib/ghmac-gnutls.c
new file mode 100644
index 000000000..f1a74a849
--- /dev/null
+++ b/glib/ghmac-gnutls.c
@@ -0,0 +1,164 @@
+/* ghmac.h - data hashing functions
+ *
+ * Copyright (C) 2011 Collabora Ltd.
+ * Copyright (C) 2019 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <gnutls/crypto.h>
+
+#include "ghmac.h"
+
+#include "glib/galloca.h"
+#include "gatomic.h"
+#include "gslice.h"
+#include "gmem.h"
+#include "gstrfuncs.h"
+#include "gchecksumprivate.h"
+#include "gtestutils.h"
+#include "gtypes.h"
+#include "glibintl.h"
+
+#ifndef HAVE_GNUTLS
+#error "build configuration error"
+#endif
+
+struct _GHmac
+{
+ int ref_count;
+ GChecksumType digest_type;
+ gnutls_hmac_hd_t hmac;
+ gchar *digest_str;
+};
+
+GHmac *
+g_hmac_new (GChecksumType digest_type,
+ const guchar *key,
+ gsize key_len)
+{
+ gnutls_mac_algorithm_t algo;
+ GHmac *hmac = g_slice_new0 (GHmac);
+ hmac->ref_count = 1;
+ hmac->digest_type = digest_type;
+
+ switch (digest_type)
+ {
+ case G_CHECKSUM_MD5:
+ algo = GNUTLS_MAC_MD5;
+ break;
+ case G_CHECKSUM_SHA1:
+ algo = GNUTLS_MAC_SHA1;
+ break;
+ case G_CHECKSUM_SHA256:
+ algo = GNUTLS_MAC_SHA256;
+ break;
+ case G_CHECKSUM_SHA384:
+ algo = GNUTLS_MAC_SHA384;
+ break;
+ case G_CHECKSUM_SHA512:
+ algo = GNUTLS_MAC_SHA512;
+ break;
+ default:
+ g_return_val_if_reached (NULL);
+ }
+
+ gnutls_hmac_init (&hmac->hmac, algo, key, key_len);
+
+ return hmac;
+}
+
+GHmac *
+g_hmac_copy (const GHmac *hmac)
+{
+ GHmac *copy;
+
+ g_return_val_if_fail (hmac != NULL, NULL);
+
+ copy = g_slice_new0 (GHmac);
+ copy->ref_count = 1;
+ copy->digest_type = hmac->digest_type;
+ copy->hmac = gnutls_hmac_copy (hmac->hmac);
+
+ return copy;
+}
+
+GHmac *
+g_hmac_ref (GHmac *hmac)
+{
+ g_return_val_if_fail (hmac != NULL, NULL);
+
+ g_atomic_int_inc (&hmac->ref_count);
+
+ return hmac;
+}
+
+void
+g_hmac_unref (GHmac *hmac)
+{
+ g_return_if_fail (hmac != NULL);
+
+ if (g_atomic_int_dec_and_test (&hmac->ref_count))
+ {
+ gnutls_hmac_deinit (hmac->hmac, NULL);
+ g_free (hmac->digest_str);
+ g_slice_free (GHmac, hmac);
+ }
+}
+
+
+void
+g_hmac_update (GHmac *hmac,
+ const guchar *data,
+ gssize length)
+{
+ g_return_if_fail (hmac != NULL);
+ g_return_if_fail (length == 0 || data != NULL);
+
+ gnutls_hmac (hmac->hmac, data, length);
+}
+
+const gchar *
+g_hmac_get_string (GHmac *hmac)
+{
+ guint8 *buffer;
+ gsize digest_len;
+
+ g_return_val_if_fail (hmac != NULL, NULL);
+
+ if (hmac->digest_str)
+ return hmac->digest_str;
+
+ digest_len = g_checksum_type_get_length (hmac->digest_type);
+ buffer = g_alloca (digest_len);
+
+ gnutls_hmac_output (hmac->hmac, buffer);
+ hmac->digest_str = gchecksum_digest_to_string (buffer, digest_len);
+ return hmac->digest_str;
+}
+
+
+void
+g_hmac_get_digest (GHmac *hmac,
+ guint8 *buffer,
+ gsize *digest_len)
+{
+ g_return_if_fail (hmac != NULL);
+
+ gnutls_hmac_output (hmac->hmac, buffer);
+ *digest_len = g_checksum_type_get_length (hmac->digest_type);
+}
diff --git a/glib/ghmac.c b/glib/ghmac.c
index 4f181f21f..c62d9ce4e 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -33,6 +33,9 @@
#include "gtypes.h"
#include "glibintl.h"
+#ifdef HAVE_GNUTLS
+#error "build configuration error"
+#endif
/**
* SECTION:hmac
diff --git a/glib/meson.build b/glib/meson.build
index b3bf067c7..3cdc3b573 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -252,7 +252,6 @@ glib_sources = files(
'gfileutils.c',
'ggettext.c',
'ghash.c',
- 'ghmac.c',
'ghmac-utils.c',
'ghook.c',
'ghostutils.c',
@@ -308,6 +307,7 @@ glib_sources = files(
'guriprivate.h',
'gutils.c',
'gutilsprivate.h',
+ 'gchecksumprivate.h',
'guuid.c',
'gvariant.c',
'gvariant-core.c',
@@ -352,6 +352,12 @@ else
glib_dtrace_hdr = []
endif
+if get_option('gnutls')
+ glib_sources += files('ghmac-gnutls.c')
+else
+ glib_sources += files('ghmac.c')
+endif
+
pcre_static_args = []
if use_pcre_static_flag
@@ -378,7 +384,7 @@ libglib = library('glib-2.0',
# intl.lib is not compatible with SAFESEH
link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
include_directories : configinc,
- dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
+ dependencies : pcre_deps + libgnutls_dep + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
c_args : glib_c_args,
objc_args : glib_c_args,
)
diff --git a/meson.build b/meson.build
index e0b308a25..70dd5355e 100644
--- a/meson.build
+++ b/meson.build
@@ -2056,6 +2056,13 @@ if host_system == 'linux'
glib_conf.set('HAVE_LIBMOUNT', libmount_dep.found())
endif
+# gnutls is used optionally by ghmac
+libgnutls_dep = []
+if get_option('gnutls')
+ libgnutls_dep = [dependency('gnutls', version : '>=3.6.9', required : true)]
+ glib_conf.set('HAVE_GNUTLS', 1)
+endif
+
if host_system == 'windows'
winsock2 = cc.find_library('ws2_32')
endif
diff --git a/meson_options.txt b/meson_options.txt
index af9645eda..2c4b2c37e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,6 +34,11 @@ option('libmount',
value : 'auto',
description : 'build with libmount support')
+option('gnutls',
+ type : 'boolean',
+ value : false,
+ description : 'build with gnutls support')
+
option('internal_pcre',
type : 'boolean',
value : false,
--
2.28.0

View File

@ -1 +1 @@
d80aef668f981b5dcf157633d13081c0 glib-2.34.0.tar.xz
SHA512 (glib-2.67.0.tar.xz) = 82d562bc80885c7e516e38f17a8830596b32b1e1a4b58454ca589be79e6ab27e0a2fe0a108cb02da21981c75474abed0263c0aa38c71ead45a68db675a1d2f80

View File

@ -1,19 +0,0 @@
#! /bin/sh
if test $# != 1; then
echo "usage: update-gio-modules host_triplet" 1>&2
exit 1
fi
echo "Warning: update-gio-modules is deprecated and will be removed in glib2-2.28.0"
umask 022
case "$host" in
alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
/usr/bin/gio-querymodules-64 /usr/lib64/gio/modules
;;
*)
/usr/bin/gio-querymodules-32 /usr/lib/gio/modules
;;
esac