From 974ef1723436f212fb729ffabc9c162485cecd2a Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste@gmail.com>
Date: Jan 05 2023 21:26:43 +0000
Subject: use upstream's systemd integration


/etc/default/ is deprecated,
please use systemd drop-in if you want to overide settings

---

diff --git a/apt-cacher-ng.conf b/apt-cacher-ng.conf
deleted file mode 100644
index 5d6e07a..0000000
--- a/apt-cacher-ng.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-Z /run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -
-D /run/apt-cacher-ng 0755 apt-cacher-ng apt-cacher-ng - -
diff --git a/apt-cacher-ng.service b/apt-cacher-ng.service
deleted file mode 100644
index 3a5dffc..0000000
--- a/apt-cacher-ng.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Apt-Cacher NG software download proxy
-After=syslog.target network.target remote-fs.target nss-lookup.target
-RequiresMountFor=/var/cache/apt-cacher-ng
-
-[Service]
-EnvironmentFile=-/etc/default/apt-cacher-ng
-ExecStart=/usr/sbin/apt-cacher-ng $DAEMON_OPTS SocketPath=/run/apt-cacher-ng/socket LogDir=/var/log/apt-cacher-ng ForeGround=1 $EXTRA_ACNG_OPTS
-PrivateTmp=true
-User=apt-cacher-ng
-Group=apt-cacher-ng
-
-[Install]
-WantedBy=multi-user.target
diff --git a/apt-cacher-ng.spec b/apt-cacher-ng.spec
index f6b9d83..8bdce81 100644
--- a/apt-cacher-ng.spec
+++ b/apt-cacher-ng.spec
@@ -10,8 +10,6 @@ License:          BSD-4-Clause
 URL:              http://www.unix-ag.uni-kl.de/~bloch/acng/
 Source0:          http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/%{name}_%{version}.orig.tar.xz
 Source1:          http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/%{name}_%{version}-%{debian_release}.debian.tar.xz
-Source2:          apt-cacher-ng.service
-Source3:          apt-cacher-ng.conf
 
 Provides:         bundled(sha1-hollerbach)
 Provides:         bundled(md5-deutsch-c++)
@@ -48,8 +46,11 @@ tar xfvJ %{SOURCE1}
 # Replace all instances of /usr/lib/apt-cacher-ng/ with /usr/libexec/apt-cacher-ng/
 find debian -type f -exec sed -i "s#/usr/lib/apt-cacher-ng#/usr/libexec/apt-cacher-ng#g" '{}' \;
 
+# Fix this here until UsrMerge is done in Debian too (which will take forever)
+sed -i "s#/lib/systemd/system#/usr/lib/systemd/system#" systemd/CMakeLists.txt
+
 %build
-%cmake -DLIBDIR=%{_libexecdir}/apt-cacher-ng -DACNG_CACHE_DIR=%{_var}/cache/apt-cacher-ng -DACNG_LOG_DIR=%{_var}/log/apt-cacher-ng
+%cmake -DLIBDIR=%{_libexecdir}/apt-cacher-ng -DSDINSTALL=on -DACNG_CACHE_DIR=%{_var}/cache/apt-cacher-ng -DACNG_LOG_DIR=%{_var}/log/apt-cacher-ng
 %cmake_build
 
 %install
@@ -68,15 +69,6 @@ install -D -pm 0644 debian/apt-cacher-ng.default    %{buildroot}%{_sysconfdir}/d
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -D -pm 0644 debian/apt-cacher-ng.logrotate  %{buildroot}%{_sysconfdir}/logrotate.d/apt-cacher-ng
 
-## systemd.service instead of init.d script
-mkdir -p %{buildroot}/%{_unitdir}
-install -pm 644 %{SOURCE2} %{buildroot}/%{_unitdir}/
-
-## /run/apt-cacher-ng
-mkdir -p %{buildroot}/%{_tmpfilesdir}
-install -pm 644 %{SOURCE3} %{buildroot}/%{_tmpfilesdir}/
-mkdir -p %{buildroot}%{_rundir}/apt-cacher-ng
-
 mkdir -p %{buildroot}%{_var}/cache/apt-cacher-ng
 mkdir -p %{buildroot}%{_var}/lib/apt-cacher-ng
 mkdir -p %{buildroot}%{_var}/log/apt-cacher-ng
@@ -87,8 +79,12 @@ sed -i '/^Remap-uburep/s/;/# ;/' %{buildroot}%{_sysconfdir}/apt-cacher-ng/acng.c
 sed -i '/^Remap-kxlrep/s/;/# ;/' %{buildroot}%{_sysconfdir}/apt-cacher-ng/acng.conf
 
 %pre
+# the "tmpfiles_create_package" macro should be able to do all of this
 getent group apt-cacher-ng > /dev/null || groupadd -r apt-cacher-ng
 getent passwd apt-cacher-ng > /dev/null || useradd -r -d %{_sharedstatedir}/apt-cacher-ng -g apt-cacher-ng -s /sbin/nologin -c "Apt-cacher proxy" apt-cacher-ng
+mkdir -p /run/apt-cacher-ng
+chown apt-cacher-ng:apt-cacher-ng /run/apt-cacher-ng
+chmod 755 /run/apt-cacher-ng
 
 %post
 %systemd_post apt-cacher-ng.service
@@ -103,7 +99,6 @@ getent passwd apt-cacher-ng > /dev/null || useradd -r -d %{_sharedstatedir}/apt-
 %license COPYING
 %doc TODO
 %{_docdir}/%{name}/
-%attr(700,apt-cacher-ng,apt-cacher-ng) %dir %{_rundir}/apt-cacher-ng/
 %attr(700,apt-cacher-ng,apt-cacher-ng) %dir %{_var}/lib/apt-cacher-ng/
 %attr(700,apt-cacher-ng,apt-cacher-ng) %dir %{_var}/log/apt-cacher-ng/
 %attr(700,apt-cacher-ng,apt-cacher-ng) %dir %{_var}/cache/apt-cacher-ng/