Compare commits

..

No commits in common. "master" and "synced/master" have entirely different histories.

9 changed files with 116 additions and 125 deletions

1
.gitattributes vendored
View File

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

View File

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

View File

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

View File

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

View File

@ -1,22 +1,26 @@
Summary: An implementation of an ICAP server
Name: c-icap
Version: 0.5.10
Release: 3%{?dist}
License: LGPL
%define modn c_icap
Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.logrotate
Source4: tmpfiles.conf
Summary: An implementation of an ICAP server
Name: c-icap
Version: 0.5.3
Release: 0.beta1%{?dist}
License: LGPL
URL: http://%{name}.sourceforge.net/
Source0: http://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/c_icap-%{version}.tar.gz/download
Source1: %{name}.service
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
Source4: %{name}.conf
Requires: %{name}-libs = %{version}-%{release}
URL: http://%{name}.sourceforge.net/
BuildRequires: libdb-devel
BuildRequires: gdbm-devel
BuildRequires: openldap-devel
BuildRequires: zlib-devel perl-devel
Requires: %{name}-libs = %{version}-%{release}
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
BuildRequires: systemd
BuildRequires: db4-devel gdbm-devel openldap-devel
BuildRequires: zlib-devel perl-devel
%description
C-icap is an implementation of an ICAP server. It can be used with HTTP
@ -25,81 +29,96 @@ 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.
%package devel
Summary: Development tools for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: zlib-devel
%package devel
Summary: Development tools for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: zlib-devel
%description devel
%description devel
The %{name}-devel package contains the static libraries and header files
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}
%description ldap
%package 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}.
%package libs
Summary: Libraries used by %{name}
Group: System Environment/Libraries
%description libs
%package 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 utilities.
%package perl
Summary: The Perl handler for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%package perl
Summary: The Perl handler for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description perl
%description perl
The %{name}-perl package contains the Perl handler for %{name}.
%package progs
Summary: Related programs for %{name}
Group: Applications/Internet
Requires: %{name}-libs = %{version}-%{release}
%package progs
Summary: Related programs for %{name}
Group: Applications/Internet
Requires: %{name}-libs = %{version}-%{release}
%description progs
%description progs
The %{name}-progs package contains several commandline tools for %{name}.
%prep
%setup -q -n c_icap-%{version}
%setup -q -n %{modn}-%{version}
%build
%configure \
CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \
--disable-static \
--sysconfdir=%{_sysconfdir}/%{name} \
--prefix='' \
--with-perl \
--with-zlib \
--with-bdb \
--with-ldap \
--enable-large-files
CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" \
--sysconfdir=%{_sysconfdir}/%{name} \
--enable-shared \
--enable-static \
--enable-lib-compat \
--with-perl \
--with-zlib \
--with-bdb \
--with-ldap \
--enable-large-files
# --enable-ipv6 # net.ipv6.bindv6only not supported
%{__make} %{?_smp_mflags}
%install
[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_sysconfdir}/logrotate.d
%{__mkdir_p} %{buildroot}%{_sysconfdir}/{logrotate.d,sysconfig}
%{__mkdir_p} %{buildroot}%{_sbindir}
%{__mkdir_p} %{buildroot}%{_datadir}/c_icap/{contrib,templates}
%{__mkdir_p} %{buildroot}%{_datadir}/%{modn}/{contrib,templates}
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/%{name}
%{__make} DESTDIR=%{buildroot} install
%{__mv} -f %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}
%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__make} \
DESTDIR=%{buildroot} \
install
%{__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 -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/c-icap.service
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/c_icap/contrib
%{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??}
%{__install} -m 0755 contrib/*.pl %{buildroot}%{_datadir}/%{modn}/contrib
%{__rm} -f %{buildroot}%{_libdir}/lib*.so.{?,??}
%pre
@ -107,9 +126,9 @@ if ! getent group %{name} >/dev/null 2>&1; then
/usr/sbin/groupadd -r %{name}
fi
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} \
-c "C-ICAP Service user" -M \
-c "C-ICAP Service user" -M \
-s /sbin/nologin %{name}
fi
exit 0 # Always pass
@ -120,14 +139,18 @@ exit 0 # Always pass
%post libs -p /sbin/ldconfig
%preun
%systemd_preun c-icap.service
%postun
%systemd_postun_with_restart c-icap.service
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS COPYING INSTALL README TODO
@ -136,15 +159,16 @@ exit 0 # Always pass
%attr(640,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/*.magic
%attr(640,root,%{name}) %{_sysconfdir}/%{name}/*.default
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_unitdir}/c-icap.service
%dir %{_libdir}/c_icap
%{_libdir}/c_icap/bdb_tables.so
%{_libdir}/c_icap/dnsbl_tables.so
%{_libdir}/c_icap/srv_echo.so
%{_libdir}/c_icap/sys_logger.so
%{_libdir}/c_icap/shared_cache.so
%dir %{_libdir}/%{modn}
%{_libdir}/%{modn}/bdb_tables.so
%{_libdir}/%{modn}/dnsbl_tables.so
%{_libdir}/%{modn}/srv_echo.so
%{_libdir}/%{modn}/sys_logger.so
%{_libdir}/%{modn}/shared_cache.so
%{_sbindir}/%{name}
%{_datadir}/c_icap
%{_datadir}/%{modn}
%{_mandir}/man8/%{name}.8*
%attr(750,%{name},%{name}) %dir %{_localstatedir}/log/%{name}
%attr(750,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
@ -153,33 +177,33 @@ exit 0 # Always pass
%files devel
%defattr(-,root,root)
%{_bindir}/%{name}-*config
%{_includedir}/c_icap
%{_includedir}/%{modn}
%{_libdir}/libicapapi.*a
%{_libdir}/libicapapi.so
%{_libdir}/c_icap/bdb_tables.*a
%{_libdir}/c_icap/dnsbl_tables.*a
%{_libdir}/c_icap/ldap_module.*a
%{_libdir}/c_icap/perl_handler.*a
%{_libdir}/c_icap/srv_echo.*a
%{_libdir}/c_icap/sys_logger.*a
%{_libdir}/c_icap/srv_ex206.*a
%{_libdir}/c_icap/shared_cache.*a
%{_libdir}/%{modn}/bdb_tables.*a
%{_libdir}/%{modn}/dnsbl_tables.*a
%{_libdir}/%{modn}/ldap_module.*a
%{_libdir}/%{modn}/perl_handler.*a
%{_libdir}/%{modn}/srv_echo.*a
%{_libdir}/%{modn}/sys_logger.*a
%{_libdir}/%{modn}/srv_ex206.*a
%{_libdir}/%{modn}/shared_cache.*a
%{_mandir}/man8/%{name}-*config.8*
%files ldap
%defattr(-,root,root)
%{_libdir}/c_icap/ldap_module.so
%{_libdir}/%{modn}/ldap_module.so
%files libs
%defattr(-,root,root)
%doc COPYING
%{_libdir}/libicapapi.so.*
%{_libdir}/c_icap/srv_ex206.so
%{_libdir}/%{modn}/srv_ex206.so
%files perl
%defattr(-,root,root)
%{_libdir}/c_icap/perl_handler.so
%{_libdir}/%{modn}/perl_handler.so
%files progs
%defattr(-,root,root)
@ -192,42 +216,10 @@ exit 0 # Always pass
%changelog
* Mon Feb 28 2022 Daniel Berteaud <dbd@ehtrace.com> 0.5.10-3
- Fix spacing issues in spec file (dbd@ehtrace.com)
* Sun Feb 18 2018 Daniel Berteaud <daniel@firewall-services.com> 0.5.3-0.beta1
- new package built with tito
* 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
* Sun Feb 18 2018 Daniel Berteaud <daniel@firewall-services.com> - 0.5.3
- Update to 0.5.3
* Wed Sep 27 2017 Giacomo Sanchietti <giacomo.sanchietti@nethesis.it> - 0.5.2

4
c-icap.sysconfig Normal file
View File

@ -0,0 +1,4 @@
# /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)

Binary file not shown.

1
c_icap-0.5.3.tar.gz Symbolic link
View File

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