Compare commits

...

40 Commits

Author SHA1 Message Date
65760f3e22 Automatic commit of package [c-icap] minor release [0.5.10-3].
Created by command:

/usr/bin/tito tag
2022-02-28 15:49:03 +01:00
26ce1f4caf Fix spacing issues in spec file 2022-02-28 15:48:50 +01:00
d17defbdd7 Automatic commit of package [c-icap] minor release [0.5.10-2].
Created by command:

/usr/bin/tito tag
2022-01-11 16:24:33 +01:00
82b2da47e1 Automatic commit of package [c-icap] minor release [0.5.10-1].
Created by command:

/usr/bin/tito tag
2021-12-12 21:40:39 +01:00
34cd1f776b Update to 0.5.10 2021-12-12 21:40:20 +01:00
b1a0bdb141 Automatic commit of package [c-icap] minor release [0.5.8-3].
Created by command:

/usr/bin/tito tag
2021-12-08 21:44:29 +01:00
f7668eab87 Update tito builder 2021-12-08 21:44:15 +01:00
Daniel Berteaud
a35c4c7caa Automatic commit of package [c-icap] minor release [0.5.8-2].
Created by command:

/usr/bin/tito tag
2021-08-27 16:05:03 +02:00
Daniel Berteaud
ed8a5a587a Update to 0.5.8 2021-08-27 16:04:53 +02:00
Daniel Berteaud
1e3bc3f0a9 Automatic commit of package [c-icap] minor release [0.5.7-1].
Created by command:

/usr/bin/tito tag
2020-11-12 16:57:44 +01:00
Daniel Berteaud
0378f260bc Update to 0.5.7 2020-11-12 16:52:34 +01:00
Daniel Berteaud
191b2b0e4b Automatic commit of package [c-icap] minor release [0.5.6-2].
Created by command:

/usr/bin/tito tag
2020-11-07 20:10:08 +01:00
Daniel Berteaud
b1b77c4f81 BuildReq libdb-devel instead of db4-devel 2020-11-07 20:07:55 +01:00
Daniel Berteaud
257c4d6d54 Automatic commit of package [c-icap] minor release [0.5.6-1].
Created by command:

/usr/bin/tito tag --use-release 1%{?dist} --no-auto-changelog
2019-12-11 18:51:54 +01:00
Daniel Berteaud
1449b8e3af Automatic commit of package [c-icap] minor release [0.5.6-0.beta1].
Created by command:

/usr/bin/tito tag --use-version 0.5.6 --use-release 0.beta1%{?dist}
2019-12-11 17:50:39 +01:00
Daniel Berteaud
702ead5c82 Update to 0.5.6 2019-12-11 17:50:03 +01:00
Daniel Berteaud
5e02367e0b Automatic commit of package [c-icap] minor release [0.5.5-1].
Created by command:

/usr/bin/tito tag --use-version 0.5.5 --use-release 1%{?dist}
2018-11-27 08:26:49 +01:00
Daniel Berteaud
0dc653426d Update version in spec file 2018-11-27 08:24:16 +01:00
Daniel Berteaud
f28f062826 Update sources to 0.5.5 2018-11-27 08:23:38 +01:00
Daniel Berteaud
fd87c6e328 Update tito config to use GitLfsBuilder 2018-11-27 08:23:25 +01:00
Daniel Berteaud
566178d4d9 Track sources with git lfs 2018-11-27 08:23:13 +01:00
Daniel Berteaud
8af43aeaab Automatic commit of package [c-icap] minor release [0.5.3-2].
Created by command:

/usr/bin/tito tag --no-auto-changelog --use-release 2%{?dist}
2018-02-23 09:07:28 +01:00
Daniel Berteaud
ea0ebd462a Automatic commit of package [c-icap] minor release [0.5.3-0.beta6].
Created by command:

/usr/bin/tito tag --use-release 0.beta6%{?dist} --no-auto-changelog
2018-02-19 16:43:29 +01:00
Daniel Berteaud
c20443f052 Automatic commit of package [c-icap] minor release [0.5.3-0.beta5].
Created by command:

/usr/bin/tito tag --use-release 0.beta5%{?dist}
2018-02-19 16:43:04 +01:00
Daniel Berteaud
c895bdf73e Automatic commit of package [c-icap] minor release [0.5.3-1.beta4].
Created by command:

/usr/bin/tito tag
2018-02-19 16:42:45 +01:00
Daniel Berteaud
5d2149ad27 Remove debug statements in service unit 2018-02-19 16:42:28 +01:00
Daniel Berteaud
f3723132a0 Automatic commit of package [c-icap] minor release [0.5.3-0.beta4].
Created by command:

/usr/bin/tito tag --no-auto-changelog --use-release 0.beta4%{?dist}
2018-02-19 15:52:24 +01:00
Daniel Berteaud
866b8c255d Run under c-icap account 2018-02-19 15:51:58 +01:00
Daniel Berteaud
67b38d9733 Spec cleanups 2018-02-19 15:50:53 +01:00
Daniel Berteaud
746cac8f34 Automatic commit of package [c-icap] minor release [0.5.3-1].
Created by command:

/usr/bin/tito tag --use-release 1%{?dist}
2018-02-18 22:02:41 +01:00
Daniel Berteaud
3dd34efc78 Automatic commit of package [c-icap] minor release [0.5.3-0.beta3].
Created by command:

/usr/bin/tito tag --use-release 0.beta3%{?dist}
2018-02-18 20:16:36 +01:00
Daniel Berteaud
34a1c5ec0c Re-add logrotate, only for access.log 2018-02-18 20:16:08 +01:00
Daniel Berteaud
18b4d7e64a prefix should even be empty 2018-02-18 20:12:37 +01:00
Daniel Berteaud
d3b10d2251 Set prefix to root 2018-02-18 20:06:47 +01:00
Daniel Berteaud
459f411b2d Remove ENv file in service file 2018-02-18 20:05:43 +01:00
Daniel Berteaud
0bb7e0e41b Automatic commit of package [c-icap] minor release [0.5.3-0.beta2].
Created by command:

/usr/bin/tito tag --use-release 0.beta2%{?dist}
2018-02-18 19:52:32 +01:00
Daniel Berteaud
e67e4b6d52 Remove logrotate file 2018-02-18 19:52:06 +01:00
Daniel Berteaud
7160f27558 Remove sysconfig and logrotate. ANd change the unit to simple 2018-02-18 19:27:02 +01:00
Daniel Berteaud
5f78087f25 Small cleanups in spec 2018-02-18 19:23:14 +01:00
Daniel Berteaud
1d2aee1975 Spec fixes 2018-02-18 19:12:50 +01:00
9 changed files with 125 additions and 116 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.tar.gz filter=lfs diff=lfs merge=lfs -text

View File

@ -1 +1 @@
0.5.3-0.beta1 ./ 0.5.10-3 ./

View File

@ -1,5 +1,5 @@
[buildconfig] [buildconfig]
builder = tito.builder.GitAnnexBuilder builder = dbd.builder.GitLfsBuilder
tagger = tito.tagger.ReleaseTagger tagger = tito.tagger.ReleaseTagger
changelog_do_not_remove_cherrypick = 0 changelog_do_not_remove_cherrypick = 0
changelog_format = %s (%ae) changelog_format = %s (%ae)

View File

@ -1,11 +1,13 @@
[Unit] [Unit]
Description=C-ICAP Server Description=C-ICAP Server
After=network.target remote-fs.target nss-lookup.target After=network.target
[Service] [Service]
Type=forking Type=simple
EnvironmentFile=/etc/sysconfig/c-icap ExecStart=/usr/sbin/c-icap -N -f /etc/c-icap/c-icap.conf
ExecStart=/usr/sbin/c-icap $OPTIONS User=c-icap
Group=c-icap
Restart=on-failure
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

View File

@ -1,26 +1,22 @@
%define modn c_icap Summary: An implementation of an ICAP server
Name: c-icap
Version: 0.5.10
Release: 3%{?dist}
License: LGPL
Summary: An implementation of an ICAP server Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz
Name: c-icap Source1: %{name}.service
Version: 0.5.3 Source2: %{name}.logrotate
Release: 0.beta1%{?dist} Source4: tmpfiles.conf
License: LGPL
Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz/download URL: http://%{name}.sourceforge.net/
Source1: %{name}.service
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
Source4: %{name}.conf
URL: http://%{name}.sourceforge.net/ Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release} BuildRequires: libdb-devel
Requires(post): systemd BuildRequires: gdbm-devel
Requires(preun): systemd BuildRequires: openldap-devel
Requires(postun): systemd BuildRequires: zlib-devel perl-devel
BuildRequires: systemd
BuildRequires: db4-devel gdbm-devel openldap-devel
BuildRequires: zlib-devel perl-devel
%description %description
C-icap is an implementation of an ICAP server. It can be used with HTTP C-icap is an implementation of an ICAP server. It can be used with HTTP
@ -29,96 +25,81 @@ and filtering services. Most of the commercial HTTP proxies must support
the ICAP protocol, the open source Squid 3.x proxy server supports it too. the ICAP protocol, the open source Squid 3.x proxy server supports it too.
%package devel %package devel
Summary: Development tools for %{name} Summary: Development tools for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires: zlib-devel Requires: zlib-devel
%description devel %description devel
The %{name}-devel package contains the static libraries and header files The %{name}-devel package contains the static libraries and header files
for developing software using %{name}. for developing software using %{name}.
# RUN_AS="c-icap"
%package ldap
Summary: The LDAP module for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%package ldap %description ldap
Summary: The LDAP module for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description ldap
The %{name}-ldap package contains the LDAP module for %{name}. The %{name}-ldap package contains the LDAP module for %{name}.
%package libs
Summary: Libraries used by %{name}
Group: System Environment/Libraries
%package libs %description libs
Summary: Libraries used by %{name}
Group: System Environment/Libraries
%description libs
The %{name}-libs package contains all runtime libraries used by %{name} and The %{name}-libs package contains all runtime libraries used by %{name} and
the utilities. the utilities.
%package perl %package perl
Summary: The Perl handler for %{name} Summary: The Perl handler for %{name}
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description perl %description perl
The %{name}-perl package contains the Perl handler for %{name}. The %{name}-perl package contains the Perl handler for %{name}.
%package progs %package progs
Summary: Related programs for %{name} Summary: Related programs for %{name}
Group: Applications/Internet Group: Applications/Internet
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
%description progs %description progs
The %{name}-progs package contains several commandline tools for %{name}. The %{name}-progs package contains several commandline tools for %{name}.
%prep %prep
%setup -q -n %{modn}-%{version} %setup -q -n c_icap-%{version}
%build %build
%configure \ %configure \
CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \ CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \
--sysconfdir=%{_sysconfdir}/%{name} \ --disable-static \
--enable-shared \ --sysconfdir=%{_sysconfdir}/%{name} \
--enable-static \ --prefix='' \
--enable-lib-compat \ --with-perl \
--with-perl \ --with-zlib \
--with-zlib \ --with-bdb \
--with-bdb \ --with-ldap \
--with-ldap \ --enable-large-files
--enable-large-files
# --enable-ipv6 # net.ipv6.bindv6only not supported
%{__make} %{?_smp_mflags} %{__make} %{?_smp_mflags}
%install %install
[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} [ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig} %{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__mkdir_p} %{buildroot}%{_sbindir} %{__mkdir_p} %{buildroot}%{_sbindir}
%{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates} %{__mkdir_p} %{buildroot}%{_datadir}/c_icap/{contrib,templates}
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name} %{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
%{__make} \ %{__make} DESTDIR=%{buildroot} install
DESTDIR=%{buildroot} \ %{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}
install %{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}
%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf %{__install} -D -p -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
%{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service %{__install} -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/c_icap/contrib
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/%{modn}/contrib %{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??}
%{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??}
%pre %pre
@ -126,9 +107,9 @@ if ! getent group %{name} >/dev/null 2>&1; then
/usr/sbin/groupadd -r %{name} /usr/sbin/groupadd -r %{name}
fi fi
if ! getent passwd %{name} >/dev/null 2>&1; then if ! getent passwd %{name} >/dev/null 2>&1; then
/usr/sbin/useradd -r -g %{name} \ /usr/sbin/useradd -r -g %{name} \
-d %{_localstatedir}/run/%{name} \ -d %{_localstatedir}/run/%{name} \
-c "C-ICAP Service user" -M \ -c "C-ICAP Service user" -M \
-s /sbin/nologin %{name} -s /sbin/nologin %{name}
fi fi
exit 0 # Always pass exit 0 # Always pass
@ -139,18 +120,14 @@ exit 0 # Always pass
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%preun %preun
%systemd_preun c-icap.service %systemd_preun c-icap.service
%postun %postun
%systemd_postun_with_restart c-icap.service %systemd_postun_with_restart c-icap.service
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING INSTALL README TODO %doc AUTHORS COPYING INSTALL README TODO
@ -159,16 +136,15 @@ exit 0 # Always pass
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.magic %attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.magic
%attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default %attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/c-icap.service %{_unitdir}/c-icap.service
%dir %{_libdir}/%{modn} %dir %{_libdir}/c_icap
%{_libdir}/%{modn}/bdb_tables.so %{_libdir}/c_icap/bdb_tables.so
%{_libdir}/%{modn}/dnsbl_tables.so %{_libdir}/c_icap/dnsbl_tables.so
%{_libdir}/%{modn}/srv_echo.so %{_libdir}/c_icap/srv_echo.so
%{_libdir}/%{modn}/sys_logger.so %{_libdir}/c_icap/sys_logger.so
%{_libdir}/%{modn}/shared_cache.so %{_libdir}/c_icap/shared_cache.so
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_datadir}/%{modn} %{_datadir}/c_icap
%{_mandir}/man8/%{name}.8* %{_mandir}/man8/%{name}.8*
%attr(750,%{name},%{name}) %dir %{_localstatedir}/log/%{name} %attr(750,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
%attr(750,%{name},%{name}) %dir %{_localstatedir}/run/%{name} %attr(750,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
@ -177,33 +153,33 @@ exit 0 # Always pass
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/%{name}-*config %{_bindir}/%{name}-*config
%{_includedir}/%{modn} %{_includedir}/c_icap
%{_libdir}/libicapapi.*a %{_libdir}/libicapapi.*a
%{_libdir}/libicapapi.so %{_libdir}/libicapapi.so
%{_libdir}/%{modn}/bdb_tables.*a %{_libdir}/c_icap/bdb_tables.*a
%{_libdir}/%{modn}/dnsbl_tables.*a %{_libdir}/c_icap/dnsbl_tables.*a
%{_libdir}/%{modn}/ldap_module.*a %{_libdir}/c_icap/ldap_module.*a
%{_libdir}/%{modn}/perl_handler.*a %{_libdir}/c_icap/perl_handler.*a
%{_libdir}/%{modn}/srv_echo.*a %{_libdir}/c_icap/srv_echo.*a
%{_libdir}/%{modn}/sys_logger.*a %{_libdir}/c_icap/sys_logger.*a
%{_libdir}/%{modn}/srv_ex206.*a %{_libdir}/c_icap/srv_ex206.*a
%{_libdir}/%{modn}/shared_cache.*a %{_libdir}/c_icap/shared_cache.*a
%{_mandir}/man8/%{name}-*config.8* %{_mandir}/man8/%{name}-*config.8*
%files ldap %files ldap
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/%{modn}/ldap_module.so %{_libdir}/c_icap/ldap_module.so
%files libs %files libs
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING %doc COPYING
%{_libdir}/libicapapi.so.* %{_libdir}/libicapapi.so.*
%{_libdir}/%{modn}/srv_ex206.so %{_libdir}/c_icap/srv_ex206.so
%files perl %files perl
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/%{modn}/perl_handler.so %{_libdir}/c_icap/perl_handler.so
%files progs %files progs
%defattr(-,root,root) %defattr(-,root,root)
@ -216,10 +192,42 @@ exit 0 # Always pass
%changelog %changelog
* Sun Feb 18 2018 Daniel Berteaud <daniel@firewall-services.com> 0.5.3-0.beta1 * Mon Feb 28 2022 Daniel Berteaud <dbd@ehtrace.com> 0.5.10-3
- new package built with tito - Fix spacing issues in spec file (dbd@ehtrace.com)
* Sun Feb 18 2018 Daniel Berteaud <daniel@firewall-services.com> - 0.5.3 * Tue Jan 11 2022 Daniel Berteaud <dbd@ehtrace.com> 0.5.10-2
- Release bump
* Sun Dec 12 2021 Daniel Berteaud <dani@lapiole.org> 0.5.10-1
- Update to 0.5.10 (dani@lapiole.org)
* Wed Dec 08 2021 Daniel Berteaud <dani@lapiole.org> 0.5.8-3
- Update tito builder (dani@lapiole.org)
* Fri Aug 27 2021 Daniel Berteaud <daniel@firewall-services.com> 0.5.8-2
- Update to 0.5.8 (daniel@firewall-services.com)
* Thu Nov 12 2020 Daniel Berteaud <daniel@firewall-services.com> 0.5.7-1
- Update to 0.5.7 (daniel@firewall-services.com)
* Sat Nov 07 2020 Daniel Berteaud <daniel@firewall-services.com> 0.5.6-2
- BuildReq libdb-devel instead of db4-devel (daniel@firewall-services.com)
* Wed Dec 11 2019 Daniel Berteaud <daniel@firewall-services.com> 0.5.6-1
- Update to 0.5.6 (daniel@firewall-services.com)
* Tue Nov 27 2018 Daniel Berteaud <daniel@firewall-services.com> 0.5.5-1
- Update sources to 0.5.5 (daniel@firewall-services.com)
- Update tito config to use GitLfsBuilder (daniel@firewall-services.com)
- Track sources with git lfs (daniel@firewall-services.com)
* Mon Feb 19 2018 Daniel Berteaud <daniel@firewall-services.com> 0.5.3-0.beta6
- Remove debug statements in service unit (daniel@firewall-services.com)
* Sun Feb 18 2018 Daniel Berteaud <daniel@firewall-services.com> 0.5.3-1
- Stable release
- Clean spec file
- Use syslog for daemon logging
- Update to 0.5.3 - Update to 0.5.3
* Wed Sep 27 2017 Giacomo Sanchietti <giacomo.sanchietti@nethesis.it> - 0.5.2 * Wed Sep 27 2017 Giacomo Sanchietti <giacomo.sanchietti@nethesis.it> - 0.5.2

View File

@ -1,4 +0,0 @@
# /etc/sysconfig/c-icap
#
# Add extra daemon options here
OPTIONS="-f /etc/c-icap/c-icap.conf"

BIN
c_icap-0.5.10.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1 +0,0 @@
.git/annex/objects/jq/6k/SHA256E-s690423--0238508c94a406c7a2c8a0ff9659e7ba631554eda55001b43351bb68f85121d2.tar.gz/SHA256E-s690423--0238508c94a406c7a2c8a0ff9659e7ba631554eda55001b43351bb68f85121d2.tar.gz