Control: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for apt-cacher-ng (versioned as 3.7.4-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru apt-cacher-ng-3.7.4/debian/changelog apt-cacher-ng-3.7.4/debian/changelog --- apt-cacher-ng-3.7.4/debian/changelog 2021-12-07 14:50:20.000000000 +0100 +++ apt-cacher-ng-3.7.4/debian/changelog 2024-06-11 00:41:08.000000000 +0200 @@ -1,3 +1,11 @@ +apt-cacher-ng (3.7.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Simplify !defined(HAVE_STRLCPY) check to fix FTBFS (Closes: #1071295) + * Avoid installing empty /lib/systemd/system directory (Closes: #1059190) + + -- Chris Hofstaedtler <z...@debian.org> Tue, 11 Jun 2024 00:41:08 +0200 + apt-cacher-ng (3.7.4-1) unstable; urgency=medium * New upstream version @@ -514,7 +522,7 @@ apt-cacher-ng (0.8.0~rc3-1) unstable; urgency=low - * New upstream version, first Sid upload of 0.8.x + * New upstream version, first Sid upload of 0.8.x + systemd related changes: startup notification, restart on crashes (closes: #752255) + Now really fixes lookup of .default files in the resource directory @@ -617,7 +625,7 @@ * Review of maintainer scripts, now responsive to modification of CacheDir in existing configuration file(s) * Defensive behavior of Debconf integration (closes: #732606) and including - NEWS.Debian to explain the extended config handling + NEWS.Debian to explain the extended config handling * added libssl-dev to build dependencies (now really closes: #729508) * fixing build failure on architectures where ancgfs is not built (i.e. Hurd) * Debconf description improvement in better German translation @@ -630,7 +638,7 @@ + fixes reading of certain .xz files (closes: #729941, #731804) + HTTPS support (closes: #729508) * more debconf controlled settings injected through a separate config - file, partially based on the patch from + file, partially based on the patch from Geert Stappers <stapp...@stappers.nl> (closes: #726656) * policy version bump, and no longer recommending perl, there are enough functionality replacements implemented to work with just perl-base @@ -812,7 +820,7 @@ apt-cacher-ng (0.7.4-1) unstable; urgency=medium - * New upstream release + * New upstream release + prevents endless looping in certain situations (LP: #999915) + more tolerance to unstable connections and behavior fix for conflicting downloads in maintenance mode (closes: #672801) @@ -1113,7 +1121,7 @@ apt-cacher-ng (0.4.9-2) unstable; urgency=low - * Minor change to support Ubuntu release notes delivery with GET + * Minor change to support Ubuntu release notes delivery with GET parameters (closes: #588662) -- Eduard Bloch <bl...@debian.org> Sun, 11 Jul 2010 11:06:49 +0200 @@ -1139,7 +1147,7 @@ apt-cacher-ng (0.4.7-1) unstable; urgency=low - * New upstream version + * New upstream version + supports fallback backends descriptions which are used when the file is specified in the config but not configured properly. Intended to help in a heterogeneous Debian/Ubuntu environment (closes Ubuntu tasks @@ -1164,7 +1172,7 @@ * New upstream release + documented DnsCacheSeconds (Ubuntu bug 530524) - + Added simple implementation of SOAP request forwarding for PTS + + Added simple implementation of SOAP request forwarding for PTS access (closes: #453277) + Typo fix in userinfo.html (closes: #572171) @@ -1224,7 +1232,7 @@ + passing HTTP redirection target through to user (closes: #556234) * Unconfuse crontab expiration script when BindAdress contains multiple entries (patch by Hellekin O\. Wolf, closes: #554707) - + -- Eduard Bloch <bl...@debian.org> Sun, 22 Nov 2009 19:06:32 +0100 apt-cacher-ng (0.4-1) unstable; urgency=low diff -Nru apt-cacher-ng-3.7.4/debian/patches/cmakedefines.patch apt-cacher-ng-3.7.4/debian/patches/cmakedefines.patch --- apt-cacher-ng-3.7.4/debian/patches/cmakedefines.patch 1970-01-01 01:00:00.000000000 +0100 +++ apt-cacher-ng-3.7.4/debian/patches/cmakedefines.patch 2024-06-11 00:36:51.000000000 +0200 @@ -0,0 +1,26 @@ +Index: apt-cacher-ng-3.7.4/src/meta.h +=================================================================== +--- apt-cacher-ng-3.7.4.orig/src/meta.h ++++ apt-cacher-ng-3.7.4/src/meta.h +@@ -323,7 +323,7 @@ class NoCaseStringMap : public std::map< + static constexpr string_view svRN = szRN; + static constexpr string_view svLF = "\n"; + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize); + #endif + } +Index: apt-cacher-ng-3.7.4/src/meta.cc +=================================================================== +--- apt-cacher-ng-3.7.4.orig/src/meta.cc ++++ apt-cacher-ng-3.7.4/src/meta.cc +@@ -831,7 +831,7 @@ bool scaseequals(string_view a, string_v + return true; + } + +-#if !defined(HAVE_STRLCPY) || !HAVE_STRLCPY ++#if !defined(HAVE_STRLCPY) + size_t strlcpy(char *tgt, const char *src, size_t tgtSize) + { + auto p = src; diff -Nru apt-cacher-ng-3.7.4/debian/patches/series apt-cacher-ng-3.7.4/debian/patches/series --- apt-cacher-ng-3.7.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ apt-cacher-ng-3.7.4/debian/patches/series 2024-06-11 00:31:13.000000000 +0200 @@ -0,0 +1 @@ +cmakedefines.patch diff -Nru apt-cacher-ng-3.7.4/debian/rules apt-cacher-ng-3.7.4/debian/rules --- apt-cacher-ng-3.7.4/debian/rules 2021-12-07 14:50:20.000000000 +0100 +++ apt-cacher-ng-3.7.4/debian/rules 2024-06-11 00:39:09.000000000 +0200 @@ -37,6 +37,7 @@ # let dh_systemd deal with them mv $(TGT)/usr/lib/tmpfiles.d/apt-cacher-ng.conf debian/apt-cacher-ng.tmpfile mv $(TGT)/lib/systemd/system/*.service debian/ + rmdir --parents --ignore-fail-on-non-empty $(TGT)/lib/systemd/system $(MAKE) -C dbgen package DBGENERATOR=dbgenerator test -r debian/apt-cacher-ng/etc/apt-cacher-ng/backends_debian.default || mv debian/apt-cacher-ng/usr/lib/apt-cacher-ng/backends_debian.default debian/apt-cacher-ng/etc/apt-cacher-ng/ test -r debian/apt-cacher-ng/etc/apt-cacher-ng/backends_ubuntu.default || mv debian/apt-cacher-ng/usr/lib/apt-cacher-ng/backends_ubuntu.default debian/apt-cacher-ng/etc/apt-cacher-ng/