public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/c-icap] f44: Upgrade to new upstream version
@ 2026-08-20 12:58 Frank Crawford
0 siblings, 0 replies; only message in thread
From: Frank Crawford @ 2026-08-20 12:58 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/c-icap
Branch : f44
Commit : b449da87585963bd558765d5e5e2c448e6f29c41
Author : Frank Crawford <frank@crawford.emu.id.au>
Date : 2026-08-20T19:59:38+10:00
Stats : +17/-70 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/c-icap/c/b449da87585963bd558765d5e5e2c448e6f29c41?branch=f44
Log:
Upgrade to new upstream version
---
diff --git a/c-icap-configure-c99.patch b/c-icap-configure-c99.patch
deleted file mode 100644
index 39115d6..0000000
--- a/c-icap-configure-c99.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-configure.ac: Include <stdlib.h> for exit() in the semaphore probe
-
-Otherwise, the probe will fail unconditionally (not test anything) if
-the C compiler does not support implicit function declarations.
-
-Submitted upstream: <https://github.com/c-icap/c-icap-server/pull/58>
-
-diff --git a/configure.ac b/configure.ac
-index c41fbd58d4d76845..03de09d89566cb30 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -985,6 +985,7 @@ AC_CACHE_CHECK([if posix 1003.1b interprocess semaphores works], ac_cv_10031b_ip
- [AC_LANG_SOURCE([
- #include <semaphore.h>
- #include <sys/wait.h>
-+ #include <stdlib.h>
-
- int main(int argc,char **argv){
- sem_t s;
diff --git a/c-icap-gcc15.patch b/c-icap-gcc15.patch
deleted file mode 100644
index c66bd69..0000000
--- a/c-icap-gcc15.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/module.h b/include/module.h
-index 3ad7f02..d1fae58 100644
---- a/include/module.h
-+++ b/include/module.h
-@@ -96,7 +96,7 @@ typedef struct http_auth_method {
- void *(*create_auth_data)(const char *authorization_header,const char **username);
- void (*release_auth_data)(void *data);
- char *(*authentication_header)(ci_request_t *req);
-- void (*release_authentication_header)();
-+ void (*release_authentication_header)(const char *auth_header);
- struct ci_conf_entry *conf_table;
- } http_auth_method_t;
-
-diff --git a/mpmt_server.c b/mpmt_server.c
-index d0de3f1..f6f07b3 100644
---- a/mpmt_server.c
-+++ b/mpmt_server.c
-@@ -138,7 +138,7 @@ static void sigchld_handler_main(int sig)
- /*Do nothing the signal will be ignored..... */
- }
-
--static void sighup_handler_main()
-+static void sighup_handler_main(int sig)
- {
- c_icap_reconfigure = 1;
- }
diff --git a/c-icap-libdb-path.patch b/c-icap-libdb-path.patch
deleted file mode 100644
index 808f972..0000000
--- a/c-icap-libdb-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3795e82..4f6cb44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -370,7 +370,7 @@ case "$withval" in
-
- if test a"$perlbin" != a; then
- perlcore=`$perlbin -MConfig -e 'print $Config{archlib}'`/CORE;
-- perllib=`$perlbin -MConfig -e 'print $Config{libs}'`;
-+ perllib=`$perlbin -MConfig -e 'print $Config{libs}' | sed -e 's/-ldb//g'` ;
- perlccflags=`$perlbin -MConfig -e 'print $Config{ccflags}'`;
- perlldflags=`$perlbin -MConfig -e 'print $Config{ccdlflags}'`;
- fi
diff --git a/c-icap.spec b/c-icap.spec
index c76183e..b3370c3 100644
--- a/c-icap.spec
+++ b/c-icap.spec
@@ -1,8 +1,8 @@
%global full_version C_ICAP_%{version}
Name: c-icap
-Version: 0.6.3
-Release: 5%{?dist}
+Version: 0.6.5
+Release: 1%{?dist}
Summary: An implementation of an ICAP server
License: LGPL-2.1-or-later and GPL-2.0-or-later
URL: http://%{name}.sourceforge.net/
@@ -15,10 +15,6 @@ Source5: %{name}.sysusers.conf
# Adjust some paths to standard Fedora/EPEL ones:
Patch0: %{name}-conf.in.patch
-# Patches from the c_icap_0_6_x branch:
-Patch3: c-icap-configure-c99.patch
-# Patch for gcc15 in F42
-Patch4: c-icap-gcc15.patch
BuildRequires: autoconf
BuildRequires: automake
@@ -39,7 +35,7 @@ BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel
Requires: logrotate
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
Requires(pre): shadow-utils
%endif
@@ -121,7 +117,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/%{name}/
mkdir -p %{buildroot}/run/%{name}/
# Required before bin/sbin merge in F42
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
mv -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/
%endif
@@ -129,7 +125,7 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf
%endif
@@ -141,7 +137,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
# Required prior to sysusers.d support in F42
-%if 0%{?fedora} < 42
+%if ! (0%{?fedora} >= 42 || 0%{?rhel} >= 11)
%pre
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null ||
@@ -197,7 +193,7 @@ exit 0
%{_unitdir}/%{name}.service
%attr(750,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
-%if 0%{?fedora} >= 42
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
%{_sysusersdir}/%{name}.conf
%endif
@@ -214,6 +210,15 @@ exit 0
%{_libdir}/libicapapi.so.*
%changelog
+* Thu Aug 20 2026 Frank Crawford <frank@crawford.emu.id.au> - 0.6.5-1
+- Update to 0.6.5 release.
+
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.6.3-6
+- Rebuilt for openssl 4.0
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index f76eaeb..df24da1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (c-icap-0.6.3.tar.gz) = e146ec083794731504c97d52e6a53ac34a78aa4f9f867de0eb2e4d17db404b49a5c4a33a3e81d3198fad557d9653b69195108573185ce0e3a5ce444a27baa894
+SHA512 (c-icap-0.6.5.tar.gz) = 9223b497947bfca941e1eda161e95eec96cce8f29bc82e112a9fe478341ecf0972968337e2ae75834cb260343cc9daa30f703166fa3f72256808c91fd1993d2c
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-20 12:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-20 12:58 [rpms/c-icap] f44: Upgrade to new upstream version Frank Crawford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox