Hello community,

here is the log from the commit of package squid for openSUSE:Factory checked 
in at 2018-02-20 17:56:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/squid (Old)
 and      /work/SRC/openSUSE:Factory/.squid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "squid"

Tue Feb 20 17:56:11 2018 rev:56 rq:578257 version:4.0.23

Changes:
--------
--- /work/SRC/openSUSE:Factory/squid/squid.changes      2018-02-06 
16:47:38.636308336 +0100
+++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2018-02-20 
17:56:17.275844576 +0100
@@ -1,0 +2,13 @@
+Mon Feb 19 08:08:14 UTC 2018 - adam.ma...@suse.de
+
+- Spec file cleanup:
+  + Drop unused fillup template - it's not used by systemd script
+  + Drop %pretrans section which is only used to upgrade from
+    version 3.4 of squid - no supported codestream has that version.
+  + Drop explicit BR: on systemd-rpm-macros
+- Update squid.service systemd file
+  + Don't need to use squid to manage squid anymore
+  + Drop references to default config file, since it's default
+- Drop reference to nonexistent EnvironmentFile in the service file
+
+-------------------------------------------------------------------

Old:
----
  squid.sysconfig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.AOc9uX/_old  2018-02-20 17:56:18.903785959 +0100
+++ /var/tmp/diff_new_pack.AOc9uX/_new  2018-02-20 17:56:18.907785815 +0100
@@ -18,10 +18,6 @@
 
 %define         squidlibdir %{_libdir}/squid
 %define         squidconfdir %{_sysconfdir}/squid
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir %{_localstatedir}/adm/fillup-templates
-%endif
 Name:           squid
 Version:        4.0.23
 Release:        0
@@ -31,7 +27,6 @@
 Url:            http://www.squid-cache.org
 Source0:        http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz
 Source1:        
http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc
-Source4:        squid.sysconfig
 Source5:        pam.squid
 Source6:        unsquid.pl
 Source7:        %{name}.logrotate
@@ -58,7 +53,6 @@
 BuildRequires:  pkgconfig
 BuildRequires:  samba-winbind
 BuildRequires:  sharutils
-BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(gssrpc)
 BuildRequires:  pkgconfig(kdb)
@@ -66,7 +60,6 @@
 BuildRequires:  pkgconfig(libsasl2)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:       logrotate
-Requires(post): %fillup_prereq
 Requires(pre):  permissions
 Requires(pre):  shadow
 Provides:       http_proxy
@@ -186,7 +179,6 @@
 install -D -m 755 %{SOURCE16} 
%{buildroot}%{squidlibdir}/initialize_cache_if_needed.sh
 sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
-install -Dpm 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 # Move the MIB definition to the proper place (and name)
 mkdir -p %{buildroot}%{_datadir}/snmp/mibs
@@ -226,21 +218,6 @@
   fi
 fi
 
-%pretrans -p <lua>
--- Directory to symlink is not working in RPM so workaround it
--- Occurs when updating from 3.4 to 3.5
-error_dir="%{_datadir}/%{name}/errors/"
-bad_ones={"zh-cn","zh-tw"}
-print("cleaning up old directories")
-for i,f in pairs(bad_ones) do
-  pstat = posix.stat(error_dir..f)
-  if pstat and pstat.type == "directory" then
-     print ("moving away "..error_dir..f.." to "..error_dir..f .. ".rpmmoved")
-     --posix.rmdir(error_dir..f)
-     os.rename(error_dir..f, error_dir..f .. ".rpmmoved")
-  end
-end
-
 %post
 %set_permissions %{_sbindir}/basic_pam_auth
 %set_permissions %{_sbindir}/pinger
@@ -340,7 +317,6 @@
 %{_sbindir}/url_lfs_rewrite
 %{_sbindir}/ext_time_quota_acl
 %{_sbindir}/rc%{name}
-%{_fillupdir}/sysconfig.%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/cachemgr.cgi
 

++++++ initialize_cache_if_needed.sh ++++++
--- /var/tmp/diff_new_pack.AOc9uX/_old  2018-02-20 17:56:18.963783799 +0100
+++ /var/tmp/diff_new_pack.AOc9uX/_new  2018-02-20 17:56:18.963783799 +0100
@@ -8,6 +8,6 @@
 
 if ! test -d $CACHE_DIR; then
     echo "Initializing cache directories..."
-    exec /usr/sbin/squid -z -F --foreground -S -f /etc/squid/squid.conf
+    exec /usr/sbin/squid -z -F --foreground -S
 fi
 


++++++ squid.service ++++++
--- /var/tmp/diff_new_pack.AOc9uX/_old  2018-02-20 17:56:19.055780487 +0100
+++ /var/tmp/diff_new_pack.AOc9uX/_new  2018-02-20 17:56:19.055780487 +0100
@@ -1,14 +1,13 @@
 [Unit]
 Description=Squid caching proxy
+Documentation=man:squid(8)
 After=network.target named.service nss-lookup.service
 
 [Service]
 Type=forking
-EnvironmentFile=-/etc/sysconfig/squid
 ExecStartPre=%{_libdir}/squid/initialize_cache_if_needed.sh
-ExecStart=/usr/sbin/squid -F $SQUID_START_OPTIONS  -f /etc/squid/squid.conf
-ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k 
reconfigure
-ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown
+ExecStart=/usr/sbin/squid -FC
+ExecReload=/usr/bin/kill -HUP $MAINPID
 LimitNOFILE=4096
 PIDFile=/run/squid.pid
 


Reply via email to